X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=t%2Ft4014-format-patch.sh;h=3bc1cccf8869aef26e175e207dc2923d3ddb1e65;hb=66276d972c0682d49773c20ca67c33bdab9ab76d;hp=5689d590fd80e0c664000f573c64262b54243982;hpb=f341feb86a97ea184db2e01083e29582afaea63e;p=git.git diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 5689d590f..3bc1cccf8 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -549,9 +549,12 @@ test_expect_success 'options no longer allowed for format-patch' ' test_cmp expect.check output' test_expect_success 'format-patch --numstat should produce a patch' ' - git format-patch --numstat --stdout master..side | - grep "^diff --git a/" | - wc -l | - xargs test 6 = ' + git format-patch --numstat --stdout master..side > output && + test 6 = $(grep "^diff --git a/" output | wc -l)' + +test_expect_success 'format-patch -- ' ' + git format-patch master..side -- file 2>error && + ! grep "Use .--" error +' test_done