commit_packed_refs(): take a `packed_ref_store *` parameter

diff --git a/refs/files-backend.c b/refs/files-backend.c
index bc5c0de84e51761bac7a1f3bfed2baeba48959db..5d159620f07e364059ade25ed6bb68798c6c54d9 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -80,6 +80,19 @@ static struct packed_ref_store *packed_ref_store_create(
        return refs;
 }
 
+/*
+ * Die if refs is not the main ref store. caller is used in any
+ * necessary error messages.
+ */
+static void packed_assert_main_repository(struct packed_ref_store *refs,
+                                         const char *caller)
+{
+       if (refs->store_flags & REF_STORE_MAIN)
+               return;
+
+       die("BUG: operation %s only allowed for main ref store", caller);
+}
+
 /*
  * Future: need to be in "struct repository"
  * when doing a full libification.
@@ -438,19 +451,19 @@ static struct ref_dir *get_packed_refs(struct packed_ref_store *refs)
  * (see lock_packed_refs()). To actually write the packed-refs file,
  * call commit_packed_refs().
  */
-static void add_packed_ref(struct files_ref_store *refs,
+static void add_packed_ref(struct packed_ref_store *refs,
                           const char *refname, const struct object_id *oid)
 {
        struct ref_dir *packed_refs;
        struct ref_entry *packed_entry;
 
-       if (!is_lock_file_locked(&refs->packed_ref_store->lock))
+       if (!is_lock_file_locked(&refs->lock))
                die("BUG: packed refs not locked");
 
        if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
                die("Reference has invalid format: '%s'", refname);
 
-       packed_refs = get_packed_refs(refs->packed_ref_store);
+       packed_refs = get_packed_refs(refs);
        packed_entry = find_ref_entry(packed_refs, refname);
        if (packed_entry) {
                /* Overwrite the existing entry: */
@@ -1334,13 +1347,13 @@ static void write_packed_entry(FILE *fh, const char *refname,
  * hold_lock_file_for_update(). Return 0 on success. On errors, set
  * errno appropriately and return a nonzero value.
  */
-static int lock_packed_refs(struct files_ref_store *refs, int flags)
+static int lock_packed_refs(struct packed_ref_store *refs, int flags)
 {
        static int timeout_configured = 0;
        static int timeout_value = 1000;
        struct packed_ref_cache *packed_ref_cache;
 
-       files_assert_main_repository(refs, "lock_packed_refs");
+       packed_assert_main_repository(refs, "lock_packed_refs");
 
        if (!timeout_configured) {
                git_config_get_int("core.packedrefstimeout", &timeout_value);
@@ -1348,8 +1361,8 @@ static int lock_packed_refs(struct files_ref_store *refs, int flags)
        }
 
        if (hold_lock_file_for_update_timeout(
-                           &refs->packed_ref_store->lock,
-                           refs->packed_ref_store->path,
+                           &refs->lock,
+                           refs->path,
                            flags, timeout_value) < 0)
                return -1;
 
@@ -1361,9 +1374,9 @@ static int lock_packed_refs(struct files_ref_store *refs, int flags)
         * cache is still valid. We've just locked the file, but it
         * might have changed the moment *before* we locked it.
         */
-       validate_packed_ref_cache(refs->packed_ref_store);
+       validate_packed_ref_cache(refs);
 
-       packed_ref_cache = get_packed_ref_cache(refs->packed_ref_store);
+       packed_ref_cache = get_packed_ref_cache(refs);
        /* Increment the reference count to prevent it from being freed: */
        acquire_packed_ref_cache(packed_ref_cache);
        return 0;
@@ -1375,21 +1388,21 @@ static int lock_packed_refs(struct files_ref_store *refs, int flags)
  * lock_packed_refs()). Return zero on success. On errors, set errno
  * and return a nonzero value
  */
-static int commit_packed_refs(struct files_ref_store *refs)
+static int commit_packed_refs(struct packed_ref_store *refs)
 {
        struct packed_ref_cache *packed_ref_cache =
-               get_packed_ref_cache(refs->packed_ref_store);
+               get_packed_ref_cache(refs);
        int ok, error = 0;
        int save_errno = 0;
        FILE *out;
        struct ref_iterator *iter;
 
-       files_assert_main_repository(refs, "commit_packed_refs");
+       packed_assert_main_repository(refs, "commit_packed_refs");
 
-       if (!is_lock_file_locked(&refs->packed_ref_store->lock))
+       if (!is_lock_file_locked(&refs->lock))
                die("BUG: packed-refs not locked");
 
-       out = fdopen_lock_file(&refs->packed_ref_store->lock, "w");
+       out = fdopen_lock_file(&refs->lock, "w");
        if (!out)
                die_errno("unable to fdopen packed-refs descriptor");
 
@@ -1407,7 +1420,7 @@ static int commit_packed_refs(struct files_ref_store *refs)
        if (ok != ITER_DONE)
                die("error while iterating over references");
 
-       if (commit_lock_file(&refs->packed_ref_store->lock)) {
+       if (commit_lock_file(&refs->lock)) {
                save_errno = errno;
                error = -1;
        }
@@ -1560,7 +1573,7 @@ static int files_pack_refs(struct ref_store *ref_store, unsigned int flags)
        int ok;
        struct ref_to_prune *refs_to_prune = NULL;
 
-       lock_packed_refs(refs, LOCK_DIE_ON_ERROR);
+       lock_packed_refs(refs->packed_ref_store, LOCK_DIE_ON_ERROR);
 
        iter = cache_ref_iterator_begin(get_loose_ref_cache(refs), NULL, 0);
        while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
@@ -1579,7 +1592,7 @@ static int files_pack_refs(struct ref_store *ref_store, unsigned int flags)
                 * we don't copy the peeled status, because we want it
                 * to be re-peeled.
                 */
-               add_packed_ref(refs, iter->refname, iter->oid);
+               add_packed_ref(refs->packed_ref_store, iter->refname, iter->oid);
 
                /* Schedule the loose reference for pruning if requested. */
                if ((flags & PACK_REFS_PRUNE)) {
@@ -1593,7 +1606,7 @@ static int files_pack_refs(struct ref_store *ref_store, unsigned int flags)
        if (ok != ITER_DONE)
                die("error while iterating over references");
 
-       if (commit_packed_refs(refs))
+       if (commit_packed_refs(refs->packed_ref_store))
                die_errno("unable to overwrite old ref-pack file");
 
        prune_refs(refs, refs_to_prune);
@@ -1629,7 +1642,7 @@ static int repack_without_refs(struct files_ref_store *refs,
        if (!needs_repacking)
                return 0; /* no refname exists in packed refs */
 
-       if (lock_packed_refs(refs, 0)) {
+       if (lock_packed_refs(refs->packed_ref_store, 0)) {
                unable_to_lock_message(refs->packed_ref_store->path, errno, err);
                return -1;
        }
@@ -1649,7 +1662,7 @@ static int repack_without_refs(struct files_ref_store *refs,
        }
 
        /* Write what remains */
-       ret = commit_packed_refs(refs);
+       ret = commit_packed_refs(refs->packed_ref_store);
        if (ret)
                strbuf_addf(err, "unable to overwrite old ref-pack file: %s",
                            strerror(errno));
@@ -3198,7 +3211,7 @@ static int files_initial_transaction_commit(struct ref_store *ref_store,
                }
        }
 
-       if (lock_packed_refs(refs, 0)) {
+       if (lock_packed_refs(refs->packed_ref_store, 0)) {
                strbuf_addf(err, "unable to lock packed-refs file: %s",
                            strerror(errno));
                ret = TRANSACTION_GENERIC_ERROR;
@@ -3210,11 +3223,11 @@ static int files_initial_transaction_commit(struct ref_store *ref_store,
 
                if ((update->flags & REF_HAVE_NEW) &&
                    !is_null_oid(&update->new_oid))
-                       add_packed_ref(refs, update->refname,
+                       add_packed_ref(refs->packed_ref_store, update->refname,
                                       &update->new_oid);
        }
 
-       if (commit_packed_refs(refs)) {
+       if (commit_packed_refs(refs->packed_ref_store)) {
                strbuf_addf(err, "unable to commit packed-refs file: %s",
                            strerror(errno));
                ret = TRANSACTION_GENERIC_ERROR;