Merge branch 'js/rebase-count-fixes'

[thirdparty/git.git] / t / t3430-rebase-merges.sh

diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index f03599c63b969d6216f7370e1a24b0160bc6ab69..96ae0edf1e17275825c2f6fdd57f09431834ed77 100755 (executable)
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -578,4 +578,12 @@ test_expect_success '--rebase-merges with message matched with onto label' '
        EOF
 '
 
+test_expect_success 'progress shows the correct total' '
+       git checkout -b progress H &&
+       git rebase --rebase-merges --force-rebase --verbose A 2> err &&
+       # Expecting "Rebasing (N/14)" here, no bogus total number
+       grep "^Rebasing.*/14.$" err >progress &&
+       test_line_count = 14 progress
+'
+
 test_done