mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

each_ref_fn: change to take an object_id parameter

Browse Source 
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>
This commit is contained in:
Michael Haggerty
2015-05-25 18:38:28 +00:00
committed by Junio C Hamano
parent 8353847e85
commit 2b2a5be394
36 changed files with 275 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/fetch.c
View File

@ -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)