Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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...
commit 5cd7fadc076880c48a27fd4e5e70844f127ceb99 1 parent 335c6e4
Ævar Arnfjörð Bjarmason authored December 20, 2011 gitster committed December 20, 2011

Showing 1 changed file with 3 additions and 1 deletion. Show diff stats Hide diff stats

  1. 4  t/t2023-checkout-m.sh
4  t/t2023-checkout-m.sh
@@ -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

0 notes on commit 5cd7fad

Please sign in to comment.
Something went wrong with that request. Please try again.