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

gitster · gitster · commit 5d5675515e0a · 2024-06-28T15:53:19.000-07:00
Fix for a progress bar.

* ds/ahead-behind-fix:
  commit-graph: increment progress indicator
diff --git 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
@@ -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' '

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ test_expect_success TTY 'with TTY: gc --no-quiet' '`
`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' '`