]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ds/ahead-behind-fix' into maint-2.45
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Jun 2024 22:53:19 +0000 (15:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Jun 2024 22:53:19 +0000 (15:53 -0700)
Fix for a progress bar.

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

1  2 
commit-graph.c
t/t6500-gc.sh

diff --cc commit-graph.c
Simple merge
diff --cc t/t6500-gc.sh
index 43d40175f8dac940cfa669605899d78b235041c1,a85f6d685c144c250d95d84e3e01fb9f509d5bd1..1b5909d1b70bb0f02bdff6f40c778022ede1af25
@@@ -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' '