string_list_add_one_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:59 +00:00
committed by Junio C Hamano
parent 3d79f65735
commit fd95035fdb

View File

@ -918,7 +918,7 @@ out:
return ret; return ret;
} }
static int string_list_add_one_ref(const char *refname, const unsigned char *sha1, static int string_list_add_one_ref(const char *refname, const struct object_id *oid,
int flag, void *cb) int flag, void *cb)
{ {
struct string_list *refs = cb; struct string_list *refs = cb;
@ -932,12 +932,9 @@ static int string_list_add_one_ref(const char *refname, const unsigned char *sha
*/ */
void string_list_add_refs_by_glob(struct string_list *list, const char *glob) void string_list_add_refs_by_glob(struct string_list *list, const char *glob)
{ {
struct each_ref_fn_sha1_adapter wrapped_string_list_add_one_ref =
{string_list_add_one_ref, list};
assert(list->strdup_strings); assert(list->strdup_strings);
if (has_glob_specials(glob)) { if (has_glob_specials(glob)) {
for_each_glob_ref(each_ref_fn_adapter, glob, &wrapped_string_list_add_one_ref); for_each_glob_ref(string_list_add_one_ref, glob, list);
} else { } else {
unsigned char sha1[20]; unsigned char sha1[20];
if (get_sha1(glob, sha1)) if (get_sha1(glob, sha1))