Sync with maint

diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 93f23cfa8279ccc093ca332b1eb718c515dd41aa..8a72b4c43a4ff5ba2e2aeb99121ba8ba054dc396 100755 (executable)
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -66,12 +66,7 @@ test_expect_success setup '
        git commit -a -m "Right #5" &&
 
        git checkout -b long &&
-       i=0 &&
-       while test $i -lt 30
-       do
-               test_commit $i one &&
-               i=$(($i+1))
-       done &&
+       test_commit_bulk --start=0 --message=%s --filename=one 30 &&
 
        git show-branch &&