From 7dabd05634154687f99b41c917a0d119e530814e Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 25 May 2015 18:39:10 +0000 Subject: [PATCH] find_symref(): rewrite to take an object_id argument Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- upload-pack.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/upload-pack.c b/upload-pack.c index 52fab239ac..96dbedc710 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -741,8 +741,8 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo return 0; } -static int find_symref(const char *refname, const unsigned char *sha1, int flag, - void *cb_data) +static int find_symref(const char *refname, const struct object_id *oid, + int flag, void *cb_data) { const char *symref_target; struct string_list_item *item; @@ -761,10 +761,8 @@ 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(each_ref_fn_adapter, &wrapped_find_symref); + head_ref_namespaced(find_symref, &symref); if (advertise_refs || !stateless_rpc) { struct each_ref_fn_sha1_adapter wrapped_send_ref =