Merge branch 'bw/diff-color-hunk-header'

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 5689d590fd80e0c664000f573c64262b54243982..7f267f9ed1d888eeb4b3c780a048c7d09e29db3b 100755 (executable)
--- 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