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 <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Denton Liu 2019-11-12 15:08:16 -08:00 committed by Junio C Hamano
parent c245e58bb6
commit 2a02262078

View File

@ -537,7 +537,7 @@ test_expect_success 'pull --rebase=i' '
test_expect_success 'pull.rebase=invalid fails' ' test_expect_success 'pull.rebase=invalid fails' '
git reset --hard before-preserve-rebase && git reset --hard before-preserve-rebase &&
test_config pull.rebase invalid && test_config pull.rebase invalid &&
! git pull . copy test_must_fail git pull . copy
' '
test_expect_success '--rebase=false create a new merge commit' ' test_expect_success '--rebase=false create a new merge commit' '
@ -572,7 +572,7 @@ test_expect_success REBASE_P \
test_expect_success '--rebase=invalid fails' ' test_expect_success '--rebase=invalid fails' '
git reset --hard before-preserve-rebase && git reset --hard before-preserve-rebase &&
! git pull --rebase=invalid . copy test_must_fail git pull --rebase=invalid . copy
' '
test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' ' test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '