From: Jonathan Nieder Date: Sat, 14 Apr 2012 04:48:13 GMT Subject: [PATCH 3/3] test: am of empty patch should not succeed Message-ID: <20120414044813.GD1791@burratino> In-Reply-To: <20120414044413.GA1791@burratino> The "git am empty" test uses the construct git am empty-file && false || : which unconditionally returns true. Use test_must_fail instead, which also has the benefit of noticing if "git am" has segfaulted. While at it, tighten the test to check that the diagnostic appears on stderr and not stdout. Signed-off-by: Jonathan Nieder --- Tested this time. Thanks for reading. t/t4150-am.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4150-am.sh b/t/t4150-am.sh index ebb4a26a..cdafd7e7 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -525,7 +525,7 @@ test_expect_success 'am empty-file does not infloop' ' git reset --hard && touch empty-file && test_tick && - { git am empty-file > actual 2>&1 && false || :; } && + test_must_fail git am empty-file 2>actual && echo Patch format detection failed. >expected && test_i18ncmp expected actual ' -- 1.7.10