mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
b821ca788b
commit
d5bb92eced
|
@ -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' '
|
||||
|
|
Loading…
Reference in a new issue