From: Denton Liu Date: Tue, 12 Nov 2019 23:08:16 +0000 (-0800) Subject: t5520: replace `! git` with `test_must_fail git` X-Git-Tag: v2.25.0-rc0~73^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a02262078e63dd2b90b2ab40ff024eccb444a48;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index ef3dbc201a..602d996a33 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -537,7 +537,7 @@ test_expect_success 'pull --rebase=i' ' test_expect_success 'pull.rebase=invalid fails' ' git reset --hard before-preserve-rebase && test_config pull.rebase invalid && - ! git pull . copy + test_must_fail git pull . copy ' 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' ' 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' '