From 5cd7fadc076880c48a27fd4e5e70844f127ceb99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Tue, 20 Dec 2011 20:37:45 +0000 Subject: t/t2023-checkout-m.sh: fix use of test_must_fail MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change an invocation of test_must_fail() to be inside a test_expect_success() as is our usual pattern. Having it outside caused our tests to fail under prove(1) since we wouldn't print a newline before TAP output: CONFLICT (content): Merge conflict in both.txt # GETTEXT POISON #ok 2 - -m restores 2-way conflicted+resolved file Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- t/t2023-checkout-m.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/t2023-checkout-m.sh b/t/t2023-checkout-m.sh index 1a40ce02e..7e1898513 100755 --- a/t/t2023-checkout-m.sh +++ b/t/t2023-checkout-m.sh @@ -17,7 +17,9 @@ test_expect_success setup ' test_commit added_in_topic each.txt in_topic ' -test_must_fail git merge master +test_expect_success 'git merge master' ' + test_must_fail git merge master +' clean_branchnames () { # Remove branch names after conflict lines -- cgit v1.2.1