Merge branch 'pw/rebase-i-after-failure' into maint-2.42

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

diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index 2668be6a4b0f158f5d02d133aae59d6899da8c64..59b5d6b6f276c367862df92f847db37906715004 100755 (executable)
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -592,4 +592,23 @@ 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_expect_success 'truncate label names' '
+       commit=$(git commit-tree -p HEAD^ -p HEAD -m "0123456789 我 123" HEAD^{tree}) &&
+       git merge --ff-only $commit &&
+
+       done="$(git rev-parse --git-path rebase-merge/done)" &&
+       git -c rebase.maxLabelLength=14 rebase --rebase-merges -x "cp \"$done\" out" --root &&
+       grep "label 0123456789-我$" out &&
+       git -c rebase.maxLabelLength=13 rebase --rebase-merges -x "cp \"$done\" out" --root &&
+       grep "label 0123456789-$" out
+'
+
 test_done