append_matching_ref(): rewrite to take an object_id argument
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
May 25, 2015 at 18:38 UTC
a00595fbd2cbe16d48a50fd7b9bcd417d062e6d4
1 file changed
+6
-7
builtin/show-branch.c
+6
-7
@@ -440,7 +440,8 @@ static int count_slash(const char *s)
440
return cnt;
441
}
442
443
-static int append_matching_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
443
+static int append_matching_ref(const char *refname, const struct object_id *oid,
444
+ int flag, void *cb_data)
445
{
446
/* we want to allow pattern hold/<asterisk> to show all
447
* branches under refs/heads/hold/, and v0.99.9? to show
@@ -456,10 +457,10 @@ static int append_matching_ref(const char *refname, const unsigned char *sha1, i
457
if (wildmatch(match_ref_pattern, tail, 0, NULL))
458
return 0;
459
if (starts_with(refname, "refs/heads/"))
459
- return append_head_ref(refname, sha1, flag, cb_data);
460
+ return append_head_ref(refname, oid->hash, flag, cb_data);
461
if (starts_with(refname, "refs/tags/"))
461
- return append_tag_ref(refname, sha1, flag, cb_data);
462
- return append_ref(refname, sha1, 0);
462
+ return append_tag_ref(refname, oid->hash, flag, cb_data);
463
+ return append_ref(refname, oid->hash, 0);
464
}
465
466
static void snarf_refs(int head, int remotes)
@@ -544,12 +545,10 @@ static void append_one_rev(const char *av)
545
if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
546
/* glob style match */
547
int saved_matches = ref_name_cnt;
547
- struct each_ref_fn_sha1_adapter wrapped_append_matching_ref =
548
- {append_matching_ref, NULL};
548
549
match_ref_pattern = av;
550
match_ref_slash = count_slash(av);
552
- for_each_ref(each_ref_fn_adapter, &wrapped_append_matching_ref);
551
+ for_each_ref(append_matching_ref, NULL);
552
if (saved_matches == ref_name_cnt &&
553
ref_name_cnt < MAX_REVS)
554
error("no matching refs with %s", av);