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 <mhagger@alum.mit.edu> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Michael Haggerty committed May 25, 2015 at 18:39 UTC b1b49c6eb607b3f5697db7dae51e5152a3af3423
1 file changed +7 -3
fetch-pack.c
+7 -3
@@ -70,6 +70,12 @@ static int rev_list_insert_ref(const char *refname, const unsigned char *sha1, i
70 return 0;
71 }
72
73 +static int rev_list_insert_ref_oid(const char *refname, const struct object_id *oid,
74 + int flag, void *cb_data)
75 +{
76 + return rev_list_insert_ref(refname, oid->hash, flag, cb_data);
77 +}
78 +
79 static int clear_marks(const char *refname, const struct object_id *oid,
80 int flag, void *cb_data)
81 {
@@ -257,8 +263,6 @@ static int find_common(struct fetch_pack_args *args,
263 int got_ready = 0;
264 struct strbuf req_buf = STRBUF_INIT;
265 size_t state_len = 0;
260 - struct each_ref_fn_sha1_adapter wrapped_rev_list_insert_ref =
261 - {rev_list_insert_ref, NULL};
266
267 if (args->stateless_rpc && multi_ack == 1)
268 die("--stateless-rpc requires multi_ack_detailed");
@@ -266,7 +270,7 @@ static int find_common(struct fetch_pack_args *args,
270 for_each_ref(clear_marks, NULL);
271 marked = 1;
272
269 - for_each_ref(each_ref_fn_adapter, &wrapped_rev_list_insert_ref);
273 + for_each_ref(rev_list_insert_ref_oid, NULL);
274 for_each_alternate_ref(insert_one_alternate_ref, NULL);
275
276 fetching = 0;