From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Jun 2024 22:53:19 +0000 (-0700)
Subject: Merge branch 'ds/ahead-behind-fix' into maint-2.45
X-Git-Tag: v2.45.3~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d5675515e0a9649ed7060ef891e7cc2a6d7a4d7;p=thirdparty%2Fgit.git

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

Fix for a progress bar.

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

5d5675515e0a9649ed7060ef891e7cc2a6d7a4d7
diff --cc t/t6500-gc.sh
index 43d40175f8,a85f6d685c..1b5909d1b7
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@@ -157,8 -173,8 +157,8 @@@ test_expect_success TTY 'with TTY: gc -
  	test_terminal env GIT_PROGRESS_DELAY=0 \
  		git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
  	test_must_be_empty stdout &&
 -	test_i18ngrep "Enumerating objects" stderr &&
 -	test_i18ngrep "Computing commit graph generation numbers: 100% (4/4), done." stderr
 +	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' '