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 /fetch-pack.c | |
| parent | 8353847e85128e0d0bbed862889f6f36c608c73b (diff) | |
| download | git-2b2a5be394bc67bed86bc009195c664dca740bd6.tar.gz git-2b2a5be394bc67bed86bc009195c664dca740bd6.tar.xz | |
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 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 48526aa54..5380b1b8c 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -256,14 +256,20 @@ static int find_common(struct fetch_pack_args *args, int got_ready = 0; struct strbuf req_buf = STRBUF_INIT; size_t state_len = 0; + struct each_ref_fn_sha1_adapter wrapped_rev_list_insert_ref = + {rev_list_insert_ref, NULL}; if (args->stateless_rpc && multi_ack == 1) die("--stateless-rpc requires multi_ack_detailed"); - if (marked) - for_each_ref(clear_marks, NULL); + if (marked) { + struct each_ref_fn_sha1_adapter wrapped_clear_marks = + {clear_marks, NULL}; + + for_each_ref(each_ref_fn_adapter, &wrapped_clear_marks); + } marked = 1; - for_each_ref(rev_list_insert_ref, NULL); + for_each_ref(each_ref_fn_adapter, &wrapped_rev_list_insert_ref); for_each_alternate_ref(insert_one_alternate_ref, NULL); fetching = 0; @@ -599,7 +605,10 @@ static int everything_local(struct fetch_pack_args *args, } if (!args->depth) { - for_each_ref(mark_complete, NULL); + struct each_ref_fn_sha1_adapter wrapped_mark_complete = + {mark_complete, NULL}; + + for_each_ref(each_ref_fn_adapter, &wrapped_mark_complete); for_each_alternate_ref(mark_alternate_complete, NULL); commit_list_sort_by_date(&complete); if (cutoff) |