From 948065a4837f006c5c84ee1288cf15f1a56d93f2 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 13 Apr 2012 23:48:13 -0500 Subject: [PATCH] test: am of empty patch should not succeed 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 Signed-off-by: Junio C Hamano --- 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 ebb4a26a0d..cdafd7e7c1 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 ' -- 2.11.4.GIT