]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t3035: prefer test_must_fail to bash negation for git commands
authorElijah Newren <newren@gmail.com>
Thu, 27 Feb 2020 00:14:22 +0000 (00:14 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2020 19:01:48 +0000 (11:01 -0800)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3035-merge-sparse.sh

index c4b4a94324a2e6c60ade51db7f7a9c1922920395..74562e1235666ffe49e0978b78dbfb06e416cd2e 100755 (executable)
@@ -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' '