Skip to content

Commit 2a02262

Browse files
Denton-Lgitster
authored andcommitted
t5520: replace ! git with test_must_fail git
Currently, if a git command fails in an unexpected way, such as a segfault, it will be masked and ignored. Replace the ! with test_must_fail so that only expected failures pass. Signed-off-by: Denton Liu <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c245e58 commit 2a02262

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t5520-pull.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ test_expect_success 'pull --rebase=i' '
537537
test_expect_success 'pull.rebase=invalid fails' '
538538
git reset --hard before-preserve-rebase &&
539539
test_config pull.rebase invalid &&
540-
! git pull . copy
540+
test_must_fail git pull . copy
541541
'
542542

543543
test_expect_success '--rebase=false create a new merge commit' '
@@ -572,7 +572,7 @@ test_expect_success REBASE_P \
572572

573573
test_expect_success '--rebase=invalid fails' '
574574
git reset --hard before-preserve-rebase &&
575-
! git pull --rebase=invalid . copy
575+
test_must_fail git pull --rebase=invalid . copy
576576
'
577577

578578
test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '

0 commit comments

Comments
 (0)