mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/only-single-progress-at-once'

Browse Source 
Further tweaks on progress API.

* ab/only-single-progress-at-once:
  pack-bitmap-write.c: don't return without stop_progress()
  progress API: unify stop_progress{,_msg}(), fix trace2 bug
  progress.c: refactor stop_progress{,_msg}() to use helpers
  progress.c: use dereferenced "progress" variable, not "(*p_progress)"
  progress.h: format and be consistent with progress.c naming
  progress.c tests: test some invalid usage
  progress.c tests: make start/stop commands on stdin
  progress.c test helper: add missing braces
  leak tests: fix a memory leak in "test-progress" helper
This commit is contained in:
Junio C Hamano
2022-02-25 15:47:35 -08:00
parent 6249ce2d1b b3118a56f9
commit a47fcfe871
6 changed files with 169 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pack-bitmap-write.c
View File

@ -575,15 +575,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;