summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-02-03 21:40:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-02-03 23:40:00 (GMT)
commitb3118a56f99ca0ec872b84dc760a0dc778f3890e (patch)
tree3c03872d6c213c3b2e29b37e3c37c86f19dac97d
parent74900a6b3513e0908b1d16df7855e9d478b20b91 (diff)
downloadgit-b3118a56f99ca0ec872b84dc760a0dc778f3890e.zip
git-b3118a56f99ca0ec872b84dc760a0dc778f3890e.tar.gz
git-b3118a56f99ca0ec872b84dc760a0dc778f3890e.tar.bz2
pack-bitmap-write.c: don't return without stop_progress()
Fix a bug that's been here since 7cc8f971085 (pack-objects: implement bitmap writing, 2013-12-21), we did not call stop_progress() if we reached the early exit in this function. We could call stop_progress() before we return, but better yet is to defer calling start_progress() until we need it. For now this only matters in practice because we'd previously omit the "region_leave" for the progress trace2 event. Suggested-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--pack-bitmap-write.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 88d9e69..f0b4044 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -544,15 +544,15 @@ void bitmap_writer_select_commits(struct commit **indexed_commits,
QSORT(indexed_commits, indexed_commits_nr, date_compare);
- if (writer.show_progress)
- writer.progress = start_progress("Selecting bitmap commits", 0);
-
if (indexed_commits_nr < 100) {
for (i = 0; i < indexed_commits_nr; ++i)
push_bitmapped_commit(indexed_commits[i]);
return;
}
+ if (writer.show_progress)
+ writer.progress = start_progress("Selecting bitmap commits", 0);
+
for (;;) {
struct commit *chosen = NULL;