From: Johannes Sixt Date: Mon, 23 Nov 2009 09:35:53 +0000 (+0100) Subject: t4014-format-patch: do not assume 'test' is available as non-builtin X-Git-Tag: v1.6.6-rc1~43 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4fa80cf0e07daa72361cd193fd88927be710c2e6;p=git.git t4014-format-patch: do not assume 'test' is available as non-builtin One test case used 'xargs test', which assumes that 'test' is available as external program. At least on MinGW it is not. Moreover, 'git format-patch' was invoked in a pipeline, but not as the last command. Rewrite the test case to catch breakage in 'git format-patch' as well. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 5689d590f..7f267f9ed 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -549,9 +549,7 @@ 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_done