Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
9914efec
Commit
9914efec
authored
Dec 24, 2015
by
Carlos Martín Nieto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refdb: bubble up errors
We can get useful information like GIT_ELOCKED out of this instead of just -1.
parent
7da4c429
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
9 deletions
+10
-9
src/refdb_fs.c
+10
-9
No files found.
src/refdb_fs.c
View file @
9914efec
...
@@ -944,41 +944,42 @@ static int packed_write(refdb_fs_backend *backend)
...
@@ -944,41 +944,42 @@ static int packed_write(refdb_fs_backend *backend)
{
{
git_sortedcache
*
refcache
=
backend
->
refcache
;
git_sortedcache
*
refcache
=
backend
->
refcache
;
git_filebuf
pack_file
=
GIT_FILEBUF_INIT
;
git_filebuf
pack_file
=
GIT_FILEBUF_INIT
;
int
error
;
size_t
i
;
size_t
i
;
/* lock the cache to updates while we do this */
/* lock the cache to updates while we do this */
if
(
git_sortedcache_wlock
(
refcache
)
<
0
)
if
(
(
error
=
git_sortedcache_wlock
(
refcache
)
)
<
0
)
return
-
1
;
return
error
;
/* Open the file! */
/* Open the file! */
if
(
git_filebuf_open
(
&
pack_file
,
git_sortedcache_path
(
refcache
),
0
,
GIT_PACKEDREFS_FILE_MODE
)
<
0
)
if
(
(
error
=
git_filebuf_open
(
&
pack_file
,
git_sortedcache_path
(
refcache
),
0
,
GIT_PACKEDREFS_FILE_MODE
)
)
<
0
)
goto
fail
;
goto
fail
;
/* Packfiles have a header... apparently
/* Packfiles have a header... apparently
* This is in fact not required, but we might as well print it
* This is in fact not required, but we might as well print it
* just for kicks */
* just for kicks */
if
(
git_filebuf_printf
(
&
pack_file
,
"%s
\n
"
,
GIT_PACKEDREFS_HEADER
)
<
0
)
if
(
(
error
=
git_filebuf_printf
(
&
pack_file
,
"%s
\n
"
,
GIT_PACKEDREFS_HEADER
)
)
<
0
)
goto
fail
;
goto
fail
;
for
(
i
=
0
;
i
<
git_sortedcache_entrycount
(
refcache
);
++
i
)
{
for
(
i
=
0
;
i
<
git_sortedcache_entrycount
(
refcache
);
++
i
)
{
struct
packref
*
ref
=
git_sortedcache_entry
(
refcache
,
i
);
struct
packref
*
ref
=
git_sortedcache_entry
(
refcache
,
i
);
assert
(
ref
);
assert
(
ref
);
if
(
packed_find_peel
(
backend
,
ref
)
<
0
)
if
(
(
error
=
packed_find_peel
(
backend
,
ref
)
)
<
0
)
goto
fail
;
goto
fail
;
if
(
packed_write_ref
(
ref
,
&
pack_file
)
<
0
)
if
(
(
error
=
packed_write_ref
(
ref
,
&
pack_file
)
)
<
0
)
goto
fail
;
goto
fail
;
}
}
/* if we've written all the references properly, we can commit
/* if we've written all the references properly, we can commit
* the packfile to make the changes effective */
* the packfile to make the changes effective */
if
(
git_filebuf_commit
(
&
pack_file
)
<
0
)
if
(
(
error
=
git_filebuf_commit
(
&
pack_file
)
)
<
0
)
goto
fail
;
goto
fail
;
/* when and only when the packfile has been properly written,
/* when and only when the packfile has been properly written,
* we can go ahead and remove the loose refs */
* we can go ahead and remove the loose refs */
if
(
packed_remove_loose
(
backend
)
<
0
)
if
(
(
error
=
packed_remove_loose
(
backend
)
)
<
0
)
goto
fail
;
goto
fail
;
git_sortedcache_updated
(
refcache
);
git_sortedcache_updated
(
refcache
);
...
@@ -991,7 +992,7 @@ fail:
...
@@ -991,7 +992,7 @@ fail:
git_filebuf_cleanup
(
&
pack_file
);
git_filebuf_cleanup
(
&
pack_file
);
git_sortedcache_wunlock
(
refcache
);
git_sortedcache_wunlock
(
refcache
);
return
-
1
;
return
error
;
}
}
static
int
reflog_append
(
refdb_fs_backend
*
backend
,
const
git_reference
*
ref
,
const
git_oid
*
old
,
const
git_oid
*
new
,
const
git_signature
*
author
,
const
char
*
message
);
static
int
reflog_append
(
refdb_fs_backend
*
backend
,
const
git_reference
*
ref
,
const
git_oid
*
old
,
const
git_oid
*
new
,
const
git_signature
*
author
,
const
char
*
message
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment