]> git.ipfire.org Git - thirdparty/git.git/commitdiff
index-pack: unify threaded and unthreaded code
authorJonathan Tan <jonathantanmy@google.com>
Mon, 24 Aug 2020 19:16:34 +0000 (12:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Aug 2020 21:02:31 +0000 (14:02 -0700)
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/index-pack.c

index a8444d550b02f22f54b40c848d617bca80f1b6d5..357e03b5aa2417a2d1c038c77953431a7aaebf97 100644 (file)
@@ -1211,15 +1211,7 @@ static void resolve_deltas(void)
                cleanup_thread();
                return;
        }
-
-       for (i = 0; i < nr_objects; i++) {
-               struct object_entry *obj = &objects[i];
-
-               if (is_delta_type(obj->type))
-                       continue;
-               resolve_base(obj);
-               display_progress(progress, nr_resolved_deltas);
-       }
+       threaded_second_pass(&nothread_data);
 }
 
 /*