The seventh batch

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

diff --git a/fetch-pack.c b/fetch-pack.c
index 5b8aa0adc77621504619b831bdd842b83f4867a1..7d2aef21add8470792e844457314f9a2d8447ddb 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)
@@ -2216,7 +2213,7 @@ void negotiate_using_fetch(const struct oid_array *negotiation_tips,
                                           the_repository, "%d",
                                           negotiation_round);
        }
-       trace2_region_enter("fetch-pack", "negotiate_using_fetch", the_repository);
+       trace2_region_leave("fetch-pack", "negotiate_using_fetch", the_repository);
        trace2_data_intmax("negotiate_using_fetch", the_repository,
                           "total_rounds", negotiation_round);
        clear_common_flag(acked_commits);