mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-25 10:06:14 +02:00
Code

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>
This commit is contained in:
Michael Haggerty 2015-05-25 18:38:45 +00:00 committed by Junio C Hamano
parent d70d7a8a4d
commit a00595fbd2
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/show-branch.c
View File

@ -440,7 +440,8 @@ static int count_slash(const char *s)
return cnt;
}
static int append_matching_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
static int append_matching_ref(const char *refname, const struct object_id *oid,
int flag, void *cb_data)
{
/* we want to allow pattern hold/<asterisk> to show all
* 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
if (wildmatch(match_ref_pattern, tail, 0, NULL))
return 0;
if (starts_with(refname, "refs/heads/"))
return append_head_ref(refname, sha1, flag, cb_data);
return append_head_ref(refname, oid->hash, flag, cb_data);
if (starts_with(refname, "refs/tags/"))
return append_tag_ref(refname, sha1, flag, cb_data);
return append_ref(refname, sha1, 0);
return append_tag_ref(refname, oid->hash, flag, cb_data);
return append_ref(refname, oid->hash, 0);
}
static void snarf_refs(int head, int remotes)
@ -544,12 +545,10 @@ static void append_one_rev(const char *av)
if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
/* glob style match */
int saved_matches = ref_name_cnt;
struct each_ref_fn_sha1_adapter wrapped_append_matching_ref =
{append_matching_ref, NULL};
match_ref_pattern = av;
match_ref_slash = count_slash(av);
for_each_ref(each_ref_fn_adapter, &wrapped_append_matching_ref);
for_each_ref(append_matching_ref, NULL);
if (saved_matches == ref_name_cnt &&
ref_name_cnt < MAX_REVS)
error("no matching refs with %s", av);