From: Jonathan Tan <jonathantanmy@google.com>
Date: Mon, 24 Aug 2020 19:16:34 +0000 (-0700)
Subject: index-pack: unify threaded and unthreaded code
X-Git-Tag: v2.29.0-rc0~59^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46e6fb1e4462fa4363b3d6ace827140dd1c4bc39;p=thirdparty%2Fgit.git

index-pack: unify threaded and unthreaded code

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index a8444d550b..357e03b5aa 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -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);
 }
 
 /*