diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2009-11-23 10:35:53 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-11-23 02:55:59 -0800 |
| commit | 4fa80cf0e07daa72361cd193fd88927be710c2e6 (patch) | |
| tree | 0022d4d4dab76cdc5a321fb4220f8217cb79e136 | |
| parent | Merge branch 'bg/fetch-multi' (diff) | |
| download | tgif-4fa80cf0e07daa72361cd193fd88927be710c2e6.tar.xz | |
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 <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t4014-format-patch.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 5689d590fd..7f267f9ed1 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 |