[PATCH 3/5] t3035: prefer test_must_fail to bash negation for git commands
From: Elijah Newren via GitGitGadget <hidden>
Date: 2020-02-27 00:14:31
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Elijah Newren <redacted> Signed-off-by: Elijah Newren <redacted> --- t/t3035-merge-sparse.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t3035-merge-sparse.sh b/t/t3035-merge-sparse.sh
index c4b4a94324a..74562e12356 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' '
--
gitgitgadget