get_packed_ref(): take a `packed_ref_store *` parameter
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>
Michael Haggerty committed
Jun 23, 2017 at 09:01 UTC
f3f97249402b74fd4cd3d0b008e0de2e14cd5b63
1 file changed
+7
-5
refs/files-backend.c
+7
-5
@@ -602,10 +602,10 @@ static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs)
602
* Return the ref_entry for the given refname from the packed
603
* references. If it does not exist, return NULL.
604
*/
605
-static struct ref_entry *get_packed_ref(struct files_ref_store *refs,
605
+static struct ref_entry *get_packed_ref(struct packed_ref_store *refs,
606
const char *refname)
607
{
608
- return find_ref_entry(get_packed_refs(refs->packed_ref_store), refname);
608
+ return find_ref_entry(get_packed_refs(refs), refname);
609
}
610
611
/*
@@ -621,7 +621,7 @@ static int resolve_packed_ref(struct files_ref_store *refs,
621
* The loose reference file does not exist; check for a packed
622
* reference.
623
*/
624
- entry = get_packed_ref(refs, refname);
624
+ entry = get_packed_ref(refs->packed_ref_store, refname);
625
if (entry) {
626
hashcpy(sha1, entry->u.value.oid.hash);
627
*flags |= REF_ISPACKED;
@@ -1044,7 +1044,9 @@ static int files_peel_ref(struct ref_store *ref_store,
1044
* have REF_KNOWS_PEELED.
1045
*/
1046
if (flag & REF_ISPACKED) {
1047
- struct ref_entry *r = get_packed_ref(refs, refname);
1047
+ struct ref_entry *r =
1048
+ get_packed_ref(refs->packed_ref_store, refname);
1049
+
1050
if (r) {
1051
if (peel_entry(r, 0))
1052
return -1;
@@ -1631,7 +1633,7 @@ static int repack_without_refs(struct files_ref_store *refs,
1633
1634
/* Look for a packed ref */
1635
for_each_string_list_item(refname, refnames) {
1634
- if (get_packed_ref(refs, refname->string)) {
1636
+ if (get_packed_ref(refs->packed_ref_store, refname->string)) {
1637
needs_repacking = 1;
1638
break;
1639
}