rev_list_insert_ref_oid(): new function, taking an object_oid

[thirdparty/git.git] / fetch-pack.c

diff --git a/fetch-pack.c b/fetch-pack.c
index d7a4a4868150e10f7c065ef962ecc2a9665e3c29..28c54c32b148eb209f6b1b646773fda444791b23 100644 (file)
--- 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;
@@ -469,7 +473,7 @@ done:
 
 static struct commit_list *complete;
 
-static int mark_complete(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
+static int mark_complete(const unsigned char *sha1)
 {
        struct object *o = parse_object(sha1);
 
@@ -493,7 +497,7 @@ static int mark_complete(const char *refname, const unsigned char *sha1, int fla
 static int mark_complete_oid(const char *refname, const struct object_id *oid,
                             int flag, void *cb_data)
 {
-       return mark_complete(refname, oid->hash, flag, cb_data);
+       return mark_complete(oid->hash);
 }
 
 static void mark_recent_complete_commits(struct fetch_pack_args *args,
@@ -573,7 +577,7 @@ static void filter_refs(struct fetch_pack_args *args,
 
 static void mark_alternate_complete(const struct ref *ref, void *unused)
 {
-       mark_complete(NULL, ref->old_sha1, 0, NULL);
+       mark_complete(ref->old_sha1);
 }
 
 static int everything_local(struct fetch_pack_args *args,