diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-02-27 00:14:22 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-02-27 11:01:48 -0800 |
| commit | d5bb92ecede53ee8e22c13bc5d86b6a2bc620bb7 (patch) | |
| tree | 41611e687dc947dc090b1305ab26a9885a591c39 /t | |
| parent | t6020, t6022, t6035: update merge tests to use test helper functions (diff) | |
| download | tgif-d5bb92ecede53ee8e22c13bc5d86b6a2bc620bb7.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3035-merge-sparse.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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' ' |