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
afc57eb4
Commit
afc57eb4
authored
Mar 19, 2014
by
Carlos Martín Nieto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reflog: simplify the append logic
Remove some duplicated logic.
parent
1afe1400
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
22 deletions
+7
-22
src/refdb_fs.c
+7
-22
No files found.
src/refdb_fs.c
View file @
afc57eb4
...
...
@@ -1572,11 +1572,10 @@ success:
/* Append to the reflog, must be called under reference lock */
static
int
reflog_append
(
refdb_fs_backend
*
backend
,
const
git_reference
*
ref
,
const
git_oid
*
old
,
const
git_oid
*
new
,
const
git_signature
*
who
,
const
char
*
message
)
{
int
error
,
is_symbolic
,
currently_exists
;
int
error
,
is_symbolic
;
git_oid
old_id
=
{{
0
}},
new_id
=
{{
0
}};
git_buf
buf
=
GIT_BUF_INIT
,
path
=
GIT_BUF_INIT
;
git_repository
*
repo
=
backend
->
repo
;
git_reference
*
current_ref
=
NULL
;
is_symbolic
=
ref
->
type
==
GIT_REF_SYMBOLIC
;
...
...
@@ -1586,37 +1585,23 @@ static int reflog_append(refdb_fs_backend *backend, const git_reference *ref, co
!
(
old
&&
new
))
return
0
;
error
=
git_reference_lookup
(
&
current_ref
,
repo
,
ref
->
name
);
if
(
error
<
0
&&
error
!=
GIT_ENOTFOUND
)
return
error
;
currently_exists
=
!!
current_ref
;
git_reference_free
(
current_ref
);
/* From here on is_symoblic also means that it's HEAD */
if
(
old
)
{
git_oid_cpy
(
&
old_id
,
old
);
}
else
if
(
currently_exists
)
{
}
else
{
error
=
git_reference_name_to_id
(
&
old_id
,
repo
,
ref
->
name
);
if
(
error
==
GIT_ENOTFOUND
)
{
memset
(
&
old_id
,
0
,
sizeof
(
git_oid
));
error
=
0
;
}
if
(
error
<
0
)
if
(
error
<
0
&&
error
!=
GIT_ENOTFOUND
)
return
error
;
}
if
(
is_symbolic
)
{
error
=
git_reference_name_to_id
(
&
new_id
,
repo
,
git_reference_symbolic_target
(
ref
));
if
(
error
!=
0
&&
error
!=
GIT_ENOTFOUND
)
goto
cleanup
;
if
(
error
<
0
&&
error
!=
GIT_ENOTFOUND
)
return
error
;
/* detaching HEAD does not create an entry */
if
(
error
==
GIT_ENOTFOUND
)
{
error
=
0
;
goto
cleanup
;
}
if
(
error
==
GIT_ENOTFOUND
)
return
0
;
giterr_clear
();
}
...
...
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