t/t2023-checkout-m.sh: fix use of test_must_fail
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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Dec 20, 2011 at 20:37 UTC
5cd7fadc076880c48a27fd4e5e70844f127ceb99
1 file changed
+3
-1
t/t2023-checkout-m.sh
+3
-1
@@ -17,7 +17,9 @@ test_expect_success setup '
17
test_commit added_in_topic each.txt in_topic
18
'
19
20
-test_must_fail git merge master
20
+test_expect_success 'git merge master' '
21
+ test_must_fail git merge master
22
+'
23
24
clean_branchnames () {
25
# Remove branch names after conflict lines