Commit 0a88c83d39e17550932ef99e7e5077c8f0d00e26
2019-02-02T19:00:47
refdb: make low-level deletion helpers explicit
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 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115
diff --git a/src/refdb_fs.c b/src/refdb_fs.c
index 23bb19f..aab1103 100644
--- a/src/refdb_fs.c
+++ b/src/refdb_fs.c
@@ -1097,6 +1097,30 @@ fail:
return error;
}
+static int packed_delete(refdb_fs_backend *backend, const char *ref_name)
+{
+ size_t pack_pos;
+ int error;
+
+ if ((error = packed_reload(backend)) < 0)
+ goto cleanup;
+
+ /* If a packed reference exists, remove it from the packfile and repack */
+ if ((error = git_sortedcache_wlock(backend->refcache)) < 0)
+ goto cleanup;
+
+ if (!(error = git_sortedcache_lookup_index(
+ &pack_pos, backend->refcache, ref_name)))
+ error = git_sortedcache_remove(backend->refcache, pack_pos);
+
+ git_sortedcache_wunlock(backend->refcache);
+
+ error = packed_write(backend);
+
+cleanup:
+ 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 has_reflog(git_repository *repo, const char *name);
@@ -1382,6 +1406,25 @@ static int refdb_fs_backend__delete(
return refdb_fs_backend__delete_tail(_backend, &file, ref_name, old_id, old_target);
}
+static int loose_delete(refdb_fs_backend *backend, const char *ref_name)
+{
+ git_buf loose_path = GIT_BUF_INIT;
+ int error = 0;
+
+ if (git_buf_joinpath(&loose_path, backend->commonpath, ref_name) < 0)
+ return -1;
+
+ error = p_unlink(loose_path.ptr);
+ if (error < 0 && errno == ENOENT)
+ error = GIT_ENOTFOUND;
+ else if (error != 0)
+ error = -1;
+
+ git_buf_dispose(&loose_path);
+
+ return error;
+}
+
static int refdb_fs_backend__delete_tail(
git_refdb_backend *_backend,
git_filebuf *file,
@@ -1389,8 +1432,6 @@ static int refdb_fs_backend__delete_tail(
const git_oid *old_id, const char *old_target)
{
refdb_fs_backend *backend = GIT_CONTAINER_OF(_backend, refdb_fs_backend, parent);
- git_buf loose_path = GIT_BUF_INIT;
- size_t pack_pos;
int error = 0, cmp = 0;
bool loose_deleted = 0;
@@ -1405,40 +1446,23 @@ static int refdb_fs_backend__delete_tail(
}
/* If a loose reference exists, remove it from the filesystem */
- if (git_buf_joinpath(&loose_path, backend->commonpath, ref_name) < 0)
- return -1;
-
+ if ((error = loose_delete(backend, ref_name)) < 0 && error != GIT_ENOTFOUND)
+ goto cleanup;
- error = p_unlink(loose_path.ptr);
- if (error < 0 && errno == ENOENT)
+ if (error == GIT_ENOTFOUND)
error = 0;
- else if (error < 0)
- goto cleanup;
else if (error == 0)
loose_deleted = 1;
- if ((error = packed_reload(backend)) < 0)
- goto cleanup;
-
- /* If a packed reference exists, remove it from the packfile and repack */
- if ((error = git_sortedcache_wlock(backend->refcache)) < 0)
+ if ((error = packed_delete(backend, ref_name)) < 0 && error != GIT_ENOTFOUND)
goto cleanup;
- if (!(error = git_sortedcache_lookup_index(
- &pack_pos, backend->refcache, ref_name)))
- error = git_sortedcache_remove(backend->refcache, pack_pos);
-
- git_sortedcache_wunlock(backend->refcache);
-
if (error == GIT_ENOTFOUND) {
error = loose_deleted ? 0 : ref_error_notfound(ref_name);
goto cleanup;
}
- error = packed_write(backend);
-
cleanup:
- git_buf_dispose(&loose_path);
git_filebuf_cleanup(file);
if (loose_deleted)
refdb_fs_backend__try_delete_empty_ref_hierarchie(backend, ref_name, false);