diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-05-25 18:38:28 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-25 12:19:27 -0700 |
| commit | 2b2a5be394bc67bed86bc009195c664dca740bd6 (patch) | |
| tree | 695bba8905d3f1d806ab329e65d2a297abfc85ac /builtin/fetch.c | |
| parent | 8353847e85128e0d0bbed862889f6f36c608c73b (diff) | |
| download | git-2b2a5be394bc67bed86bc009195c664dca740bd6.tar.gz | |
each_ref_fn: change to take an object_id parameter
Change typedef each_ref_fn to take a "const struct object_id *oid"
parameter instead of "const unsigned char *sha1".
To aid this transition, implement an adapter that can be used to wrap
old-style functions matching the old typedef, which is now called
"each_ref_sha1_fn"), and make such functions callable via the new
interface. This requires the old function and its cb_data to be
wrapped in a "struct each_ref_fn_sha1_adapter", and that object to be
used as the cb_data for an adapter function, each_ref_fn_adapter().
This is an enormous diff, but most of it consists of simple,
mechanical changes to the sites that call any of the "for_each_ref"
family of functions. Subsequent to this change, the call sites can be
rewritten one by one to use the new interface.
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>
Diffstat (limited to 'builtin/fetch.c')
| -rw-r--r-- | builtin/fetch.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 7910419c93..4878c3dbd1 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -208,8 +208,10 @@ static void find_non_local_tags(struct transport *transport, struct string_list remote_refs = STRING_LIST_INIT_NODUP; const struct ref *ref; struct string_list_item *item = NULL; + struct each_ref_fn_sha1_adapter wrapped_add_existing = + {add_existing, &existing_refs}; - for_each_ref(add_existing, &existing_refs); + for_each_ref(each_ref_fn_adapter, &wrapped_add_existing); for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) { if (!starts_with(ref->name, "refs/tags/")) continue; @@ -884,8 +886,10 @@ static int do_fetch(struct transport *transport, struct ref *rm; int autotags = (transport->remote->fetch_tags == 1); int retcode = 0; + struct each_ref_fn_sha1_adapter wrapped_add_existing = + {add_existing, &existing_refs}; - for_each_ref(add_existing, &existing_refs); + for_each_ref(each_ref_fn_adapter, &wrapped_add_existing); if (tags == TAGS_DEFAULT) { if (transport->remote->fetch_tags == 2) |