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 /upload-pack.c | |
| parent | refs: convert struct ref_entry to use struct object_id (diff) | |
| download | tgif-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 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/upload-pack.c b/upload-pack.c index 745fda8515..52fab239ac 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -761,18 +761,26 @@ static int find_symref(const char *refname, const unsigned char *sha1, int flag, static void upload_pack(void) { struct string_list symref = STRING_LIST_INIT_DUP; + struct each_ref_fn_sha1_adapter wrapped_find_symref = + {find_symref, &symref}; - head_ref_namespaced(find_symref, &symref); + head_ref_namespaced(each_ref_fn_adapter, &wrapped_find_symref); if (advertise_refs || !stateless_rpc) { + struct each_ref_fn_sha1_adapter wrapped_send_ref = + {send_ref, &symref}; + reset_timeout(); - head_ref_namespaced(send_ref, &symref); - for_each_namespaced_ref(send_ref, &symref); + head_ref_namespaced(each_ref_fn_adapter, &wrapped_send_ref); + for_each_namespaced_ref(each_ref_fn_adapter, &wrapped_send_ref); advertise_shallow_grafts(1); packet_flush(1); } else { - head_ref_namespaced(check_ref, NULL); - for_each_namespaced_ref(check_ref, NULL); + struct each_ref_fn_sha1_adapter wrapped_check_ref = + {check_ref, NULL}; + + head_ref_namespaced(each_ref_fn_adapter, &wrapped_check_ref); + for_each_namespaced_ref(each_ref_fn_adapter, &wrapped_check_ref); } string_list_clear(&symref, 1); if (advertise_refs) |