The eleventh batch

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

diff --git a/fetch-pack.c b/fetch-pack.c
index 091f9a80a9ee72593c5079b48f15ea22dbd59d4c..eba9e420ea69b8bbebe2c53127a48950e1008dab 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -290,7 +290,8 @@ static void mark_tips(struct fetch_negotiator *negotiator,
        int i;
 
        if (!negotiation_tips) {
-               for_each_rawref(rev_list_insert_ref_oid, negotiator);
+               refs_for_each_rawref(get_main_ref_store(the_repository),
+                                    rev_list_insert_ref_oid, negotiator);
                return;
        }
 
@@ -732,11 +733,6 @@ static void mark_alternate_complete(struct fetch_negotiator *negotiator UNUSED,
        mark_complete(&obj->oid);
 }
 
-struct loose_object_iter {
-       struct oidset *loose_object_set;
-       struct ref *refs;
-};
-
 /*
  * Mark recent commits available locally and reachable from a local ref as
  * COMPLETE.
@@ -793,7 +789,8 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
         */
        trace2_region_enter("fetch-pack", "mark_complete_local_refs", NULL);
        if (!args->deepen) {
-               for_each_rawref(mark_complete_oid, NULL);
+               refs_for_each_rawref(get_main_ref_store(the_repository),
+                                    mark_complete_oid, NULL);
                for_each_cached_alternate(NULL, mark_alternate_complete);
                commit_list_sort_by_date(&complete);
                if (cutoff)
@@ -1863,13 +1860,13 @@ static int fetch_pack_config_cb(const char *var, const char *value,
        const char *msg_id;
 
        if (strcmp(var, "fetch.fsck.skiplist") == 0) {
-               const char *path;
+               char *path ;
 
                if (git_config_pathname(&path, var, value))
                        return 1;
                strbuf_addf(&fsck_msg_types, "%cskiplist=%s",
                        fsck_msg_types.len ? ',' : '=', path);
-               free((char *)path);
+               free(path);
                return 0;
        }