Re: [PATCH 3/7] index-pack: unify threaded and unthreaded code
From: Junio C Hamano <hidden>
Date: 2020-08-24 21:11:16
Jonathan Tan [off-list ref] writes:
quoted hunk
Signed-off-by: Jonathan Tan <redacted> --- builtin/index-pack.c | 10 +--------- 1 file changed, 1 insertion(+), 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(¬hread_data); }
The threaded_second_pass() function has a lot more noise than the above simple and easy-to-grok loop, managing the locks, but those all turn into no-op unless init_thread() is called, which happens only when this code is not reached. So OK, this looks essentially a no-op clean-up. Thanks.