Merge branch 'tc/test-locate-httpd'

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 7f267f9ed1d888eeb4b3c780a048c7d09e29db3b..3bc1cccf8869aef26e175e207dc2923d3ddb1e65 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -552,4 +552,9 @@ test_expect_success 'format-patch --numstat should produce a patch' '
        git format-patch --numstat --stdout master..side > output &&
        test 6 = $(grep "^diff --git a/" output | wc -l)'
 
+test_expect_success 'format-patch -- <path>' '
+       git format-patch master..side -- file 2>error &&
+       ! grep "Use .--" error
+'
+
 test_done