Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 4448aba7e0727b70a4e525e57ad21cd7e226c1f8..2b912d77283fbd3fc02a7d9d6bca660e4193b8c3 100755 (executable)
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -22,7 +22,7 @@ test_expect_success setup '
                test_tick &&
                git commit -a -m $i || break
        done &&
-       git format-patch initial &&
+       git format-patch --no-numbered initial &&
        git checkout -b side initial &&
        echo local change >file-2-expect
 '