diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-28 15:53:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-28 15:53:19 -0700 |
| commit | 5d5675515e0a9649ed7060ef891e7cc2a6d7a4d7 (patch) | |
| tree | 626bf94ed6a1f3811b29feb0e430e9688958c30c | |
| parent | 112bd6a67c987032a375262ab84a66553528d041 (diff) | |
| parent | f1160393c172da29d0d0874c7d69ce76dbdc8c0c (diff) | |
| download | git-5d5675515e0a9649ed7060ef891e7cc2a6d7a4d7.tar.gz | |
Merge branch 'ds/ahead-behind-fix' into maint-2.45
Fix for a progress bar.
* ds/ahead-behind-fix:
commit-graph: increment progress indicator
| -rw-r--r-- | commit-graph.c | 2 | ||||
| -rwxr-xr-x | t/t6500-gc.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/commit-graph.c b/commit-graph.c index 45417d7412..722367281c 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -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; diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh index 43d40175f8..1b5909d1b7 100755 --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ -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' ' |