[PATCH 12/12] t5520: replace `! git` with `test_must_fail git`
- From
Denton Liu <liu.denton@gmail.com>
- Date
- Oct 17, 2019, 23:17 UTC
- Message-ID
- <4d2bf64cf8b2e51c36808e0784b96575ce89b656.1571354136.git.liu.denton@gmail.com>
- In-Reply-To
- <cover.1571354136.git.liu.denton@gmail.com>
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> --- t/t5520-pull.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index c6425d20ab..0c187b025b 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -543,7 +543,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' ' @@ -578,7 +578,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' '
-- 2.23.0.897.g0a19638b1e