reflog: simplify the append logic Remove some duplicated logic.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
diff --git a/src/refdb_fs.c b/src/refdb_fs.c
index 4bcc5fa..f2edf0c 100644
--- a/src/refdb_fs.c
+++ b/src/refdb_fs.c
@@ -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(¤t_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();
}