mirror of
https://github.com/git/git
synced 2024-11-04 16:17:49 +00:00
Merge branch 'ds/ahead-behind-fix'
Fix for a progress bar. * ds/ahead-behind-fix: commit-graph: increment progress indicator
This commit is contained in:
commit
e4ecba994c
2 changed files with 2 additions and 2 deletions
|
@ -1597,7 +1597,7 @@ static void compute_reachable_generation_numbers(
|
|||
timestamp_t gen;
|
||||
repo_parse_commit(info->r, c);
|
||||
gen = info->get_generation(c, info->data);
|
||||
display_progress(info->progress, info->progress_cnt + 1);
|
||||
display_progress(info->progress, ++info->progress_cnt);
|
||||
|
||||
if (gen != GENERATION_NUMBER_ZERO && gen != GENERATION_NUMBER_INFINITY)
|
||||
continue;
|
||||
|
|
|
@ -158,7 +158,7 @@ test_expect_success TTY 'with TTY: gc --no-quiet' '
|
|||
git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
|
||||
test_must_be_empty stdout &&
|
||||
test_grep "Enumerating objects" stderr &&
|
||||
test_grep "Computing commit graph generation numbers" stderr
|
||||
test_grep "Computing commit graph generation numbers: 100% (4/4), done." stderr
|
||||
'
|
||||
|
||||
test_expect_success 'gc --quiet' '
|
||||
|
|
Loading…
Reference in a new issue