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>
Elijah Newren committed
Feb 27, 2020 at 00:14 UTC
d5bb92ecede53ee8e22c13bc5d86b6a2bc620bb7
1 file changed
+2
-2
t/t3035-merge-sparse.sh
+2
-2
@@ -28,7 +28,7 @@ test_expect_success 'setup' '
28
git config core.sparseCheckout true &&
29
echo "/checked-out" >.git/info/sparse-checkout &&
30
git reset --hard &&
31
- ! git merge theirs
31
+ test_must_fail git merge theirs
32
'
33
34
test_expect_success 'reset --hard works after the conflict' '
@@ -42,7 +42,7 @@ test_expect_success 'is reset properly' '
42
'
43
44
test_expect_success 'setup: conflict back' '
45
- ! git merge theirs
45
+ test_must_fail git merge theirs
46
'
47
48
test_expect_success 'Merge abort works after the conflict' '