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>
This commit is contained in:
Michael Haggerty 2015-05-25 18:39:18 +00:00 коммит произвёл Junio C Hamano
Родитель 6e20a51a80
Коммит b1b49c6eb6
1 изменённых файлов: 7 добавлений и 3 удалений

Просмотреть файл

@ -70,6 +70,12 @@ static int rev_list_insert_ref(const char *refname, const unsigned char *sha1, i
return 0; 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, static int clear_marks(const char *refname, const struct object_id *oid,
int flag, void *cb_data) int flag, void *cb_data)
{ {
@ -257,8 +263,6 @@ static int find_common(struct fetch_pack_args *args,
int got_ready = 0; int got_ready = 0;
struct strbuf req_buf = STRBUF_INIT; struct strbuf req_buf = STRBUF_INIT;
size_t state_len = 0; 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) if (args->stateless_rpc && multi_ack == 1)
die("--stateless-rpc requires multi_ack_detailed"); 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); for_each_ref(clear_marks, NULL);
marked = 1; 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); for_each_alternate_ref(insert_one_alternate_ref, NULL);
fetching = 0; fetching = 0;