Git fork

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

Fix for a progress bar.

* ds/ahead-behind-fix:
commit-graph: increment progress indicator

+2 -2
+1 -1
commit-graph.c
··· 1597 1597 timestamp_t gen; 1598 1598 repo_parse_commit(info->r, c); 1599 1599 gen = info->get_generation(c, info->data); 1600 - display_progress(info->progress, info->progress_cnt + 1); 1600 + display_progress(info->progress, ++info->progress_cnt); 1601 1601 1602 1602 if (gen != GENERATION_NUMBER_ZERO && gen != GENERATION_NUMBER_INFINITY) 1603 1603 continue;
+1 -1
t/t6500-gc.sh
··· 158 158 git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && 159 159 test_must_be_empty stdout && 160 160 test_grep "Enumerating objects" stderr && 161 - test_grep "Computing commit graph generation numbers" stderr 161 + test_grep "Computing commit graph generation numbers: 100% (4/4), done." stderr 162 162 ' 163 163 164 164 test_expect_success 'gc --quiet' '