add_packed_ref(): add a files_ref_store argument

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs/files-backend.c b/refs/files-backend.c
index c31f9b6f3a952b0624276f12af876e000cd0964f..08340755d72815b10a1e9df090f604c49a51eb78 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1192,10 +1192,9 @@ static struct ref_dir *get_packed_refs(struct files_ref_store *refs)
  * lock_packed_refs()).  To actually write the packed-refs file, call
  * commit_packed_refs().
  */
  * lock_packed_refs()).  To actually write the packed-refs file, call
  * commit_packed_refs().
  */

-static void add_packed_ref(const char *refname, const unsigned char *sha1)
+static void add_packed_ref(struct files_ref_store *refs,
+                          const char *refname, const unsigned char *sha1)

 {
 {

-       struct files_ref_store *refs =
-               get_files_ref_store(NULL, "add_packed_ref");

        struct packed_ref_cache *packed_ref_cache = get_packed_ref_cache(refs);
 
        if (!packed_ref_cache->lock)
        struct packed_ref_cache *packed_ref_cache = get_packed_ref_cache(refs);
 
        if (!packed_ref_cache->lock)


@@ -3869,6 +3868,8 @@ static int ref_present(const char *refname,
 int initial_ref_transaction_commit(struct ref_transaction *transaction,
                                   struct strbuf *err)
 {
 int initial_ref_transaction_commit(struct ref_transaction *transaction,
                                   struct strbuf *err)
 {

+       struct files_ref_store *refs =
+               get_files_ref_store(NULL, "initial_ref_transaction_commit");

        int ret = 0, i;
        struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
 
        int ret = 0, i;
        struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
 


@@ -3928,7 +3929,7 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
 
                if ((update->flags & REF_HAVE_NEW) &&
                    !is_null_sha1(update->new_sha1))
 
                if ((update->flags & REF_HAVE_NEW) &&
                    !is_null_sha1(update->new_sha1))

-                       add_packed_ref(update->refname, update->new_sha1);
+                       add_packed_ref(refs, update->refname, update->new_sha1);

        }
 
        if (commit_packed_refs()) {
        }
 
        if (commit_packed_refs()) {