mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-08 12:59:54 +01:00
Code

Merge branch 'ds/ahead-behind-fix' into maint-2.45

Browse Source 
Fix for a progress bar.

* ds/ahead-behind-fix:
  commit-graph: increment progress indicator
This commit is contained in:
Junio C Hamano 2024-06-28 15:53:19 -07:00
commit 5d5675515e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commit-graph.c
View File

@ -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;

2
t/t6500-gc.sh
View File

@ -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' '