t/t2023-checkout-m.sh: fix use of test_must_fail

avar · gitster · commit 5cd7fadc0768 · 2011-12-20T13:24:02.000-08:00
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 &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,9 @@ test_expect_success setup '`
`17`	`17`	`test_commit added_in_topic each.txt in_topic`
`18`	`18`	`'`
`19`	`19`
`20`		`-test_must_fail git merge master`
	`20`	`+test_expect_success 'git merge master' '`
	`21`	`+ test_must_fail git merge master`
	`22`	`+'`
`21`	`23`
`22`	`24`	`clean_branchnames () {`
`23`	`25`	`# Remove branch names after conflict lines`