get_packed_refs(): take a `packed_ref_store *` parameter
authorMichael Haggerty <mhagger@alum.mit.edu>
Fri, 23 Jun 2017 07:01:27 +0000 (09:01 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Jun 2017 20:27:32 +0000 (13:27 -0700)
It only cares about the packed-refs part of the reference store.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
refs/files-backend.c
index b2ef7b3bb9015fde292fda382d744caa302564e0..bc5c0de84e51761bac7a1f3bfed2baeba48959db 100644 (file)
@@ -427,9 +427,9 @@ static struct ref_dir *get_packed_ref_dir(struct packed_ref_cache *packed_ref_ca
        return get_ref_dir(packed_ref_cache->cache->root);
 }
 
-static struct ref_dir *get_packed_refs(struct files_ref_store *refs)
+static struct ref_dir *get_packed_refs(struct packed_ref_store *refs)
 {
-       return get_packed_ref_dir(get_packed_ref_cache(refs->packed_ref_store));
+       return get_packed_ref_dir(get_packed_ref_cache(refs));
 }
 
 /*
@@ -450,7 +450,7 @@ static void add_packed_ref(struct files_ref_store *refs,
        if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
                die("Reference has invalid format: '%s'", refname);
 
-       packed_refs = get_packed_refs(refs);
+       packed_refs = get_packed_refs(refs->packed_ref_store);
        packed_entry = find_ref_entry(packed_refs, refname);
        if (packed_entry) {
                /* Overwrite the existing entry: */
@@ -592,7 +592,7 @@ static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs)
 static struct ref_entry *get_packed_ref(struct files_ref_store *refs,
                                        const char *refname)
 {
-       return find_ref_entry(get_packed_refs(refs), refname);
+       return find_ref_entry(get_packed_refs(refs->packed_ref_store), refname);
 }
 
 /*
@@ -1633,7 +1633,7 @@ static int repack_without_refs(struct files_ref_store *refs,
                unable_to_lock_message(refs->packed_ref_store->path, errno, err);
                return -1;
        }
-       packed = get_packed_refs(refs);
+       packed = get_packed_refs(refs->packed_ref_store);
 
        /* Remove refnames from the cache */
        for_each_string_list_item(refname, refnames)