Permalink
Browse files

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>
  • Loading branch information...
1 parent 335c6e4 commit 5cd7fadc076880c48a27fd4e5e70844f127ceb99 @avar avar committed with gitster Dec 20, 2011
Showing with 3 additions and 1 deletion.
  1. +3 −1 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

0 comments on commit 5cd7fad

Please sign in to comment.