From b1b49c6eb607b3f5697db7dae51e5152a3af3423 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 25 May 2015 18:39:18 +0000 Subject: [PATCH] rev_list_insert_ref_oid(): new function, taking an object_oid This function can be used with for_each_ref() without having to be wrapped. Signed-off-by: Michael Haggerty Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- fetch-pack.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fetch-pack.c b/fetch-pack.c index 13a5000bfe..28c54c32b1 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -70,6 +70,12 @@ static int rev_list_insert_ref(const char *refname, const unsigned char *sha1, i return 0; } +static int rev_list_insert_ref_oid(const char *refname, const struct object_id *oid, + int flag, void *cb_data) +{ + return rev_list_insert_ref(refname, oid->hash, flag, cb_data); +} + static int clear_marks(const char *refname, const struct object_id *oid, int flag, void *cb_data) { @@ -257,8 +263,6 @@ 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"); @@ -266,7 +270,7 @@ static int find_common(struct fetch_pack_args *args, for_each_ref(clear_marks, NULL); marked = 1; - for_each_ref(each_ref_fn_adapter, &wrapped_rev_list_insert_ref); + for_each_ref(rev_list_insert_ref_oid, NULL); for_each_alternate_ref(insert_one_alternate_ref, NULL); fetching = 0; -- 2.11.4.GIT