kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Elijah Newren 2020-02-27 00:14:22 +00:00 committed by Junio C Hamano
parent b821ca788b
commit d5bb92eced
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t3035-merge-sparse.sh
View File

@ -28,7 +28,7 @@ test_expect_success 'setup' '
git config core.sparseCheckout true && git config core.sparseCheckout true &&
echo "/checked-out" >.git/info/sparse-checkout && echo "/checked-out" >.git/info/sparse-checkout &&
git reset --hard && git reset --hard &&
! git merge theirs test_must_fail git merge theirs
' '


test_expect_success 'reset --hard works after the conflict' ' 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' ' test_expect_success 'setup: conflict back' '
! git merge theirs test_must_fail git merge theirs
' '


test_expect_success 'Merge abort works after the conflict' ' test_expect_success 'Merge abort works after the conflict' '