kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

pack-bitmap-write.c: don't return without stop_progress() 

Fix a bug that's been here since 7cc8f97108 (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>
maint
Ævar Arnfjörð Bjarmason 2022-02-03 22:40:19 +01:00 committed by Junio C Hamano
parent 74900a6b35
commit b3118a56f9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pack-bitmap-write.c
View File

@ -544,15 +544,15 @@ void bitmap_writer_select_commits(struct commit **indexed_commits,


QSORT(indexed_commits, indexed_commits_nr, date_compare); 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) { if (indexed_commits_nr < 100) {
for (i = 0; i < indexed_commits_nr; ++i) for (i = 0; i < indexed_commits_nr; ++i)
push_bitmapped_commit(indexed_commits[i]); push_bitmapped_commit(indexed_commits[i]);
return; return;
} }


if (writer.show_progress)
writer.progress = start_progress("Selecting bitmap commits", 0);

for (;;) { for (;;) {
struct commit *chosen = NULL; struct commit *chosen = NULL;