diff mbox series

[v2,3/7] index-pack: unify threaded and unthreaded code

Message ID dc9f0958d819f756a18f8eb7d4d1b8d618223e07.1599594441.git.jonathantanmy@google.com (mailing list archive)
State Accepted
Commit 46e6fb1e4462fa4363b3d6ace827140dd1c4bc39
Headers show
Series Better threaded delta resolution in index-pack (another try) | expand

Commit Message

Jonathan Tan Sept. 8, 2020, 7:48 p.m. UTC 
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/index-pack.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 0e0889afc4..c7b4aef4e4 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);
 }
 
 /*