From: Elijah Newren <newren@gmail.com>
Date: Thu, 27 Feb 2020 00:14:22 +0000 (+0000)
Subject: t3035: prefer test_must_fail to bash negation for git commands
X-Git-Tag: v2.26.0-rc1~5^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5bb92ecede53ee8e22c13bc5d86b6a2bc620bb7;p=thirdparty%2Fgit.git

t3035: prefer test_must_fail to bash negation for git commands

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t3035-merge-sparse.sh b/t/t3035-merge-sparse.sh
index c4b4a94324..74562e1235 100755
--- a/t/t3035-merge-sparse.sh
+++ b/t/t3035-merge-sparse.sh
@@ -28,7 +28,7 @@ test_expect_success 'setup' '
 	git config core.sparseCheckout true &&
 	echo "/checked-out" >.git/info/sparse-checkout &&
 	git reset --hard &&
-	! git merge theirs
+	test_must_fail git merge theirs
 '
 
 test_expect_success 'reset --hard works after the conflict' '
@@ -42,7 +42,7 @@ test_expect_success 'is reset properly' '
 '
 
 test_expect_success 'setup: conflict back' '
-	! git merge theirs
+	test_must_fail git merge theirs
 '
 
 test_expect_success 'Merge abort works after the conflict' '