summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2020-08-24 12:16:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-24 14:02:31 -0700
commit46e6fb1e4462fa4363b3d6ace827140dd1c4bc39 (patch)
treeb7c6d9348326fd75ae90817100b5d5e0cb9e2c60 /builtin
parentindex-pack: remove redundant parameter (diff)
downloadtgif-46e6fb1e4462fa4363b3d6ace827140dd1c4bc39.tar.xz
index-pack: unify threaded and unthreaded code
Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/index-pack.c10
1 files changed, 1 insertions, 9 deletions
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);
}
/*