diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-11-12 15:08:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-21 09:41:51 +0900 |
| commit | 2a02262078e63dd2b90b2ab40ff024eccb444a48 (patch) | |
| tree | 6a805d8af6bf6e5a96f42a1739756e6a03125741 /t | |
| parent | t5520: remove redundant lines in test cases (diff) | |
| download | git-2a02262078e63dd2b90b2ab40ff024eccb444a48.tar.gz git-2a02262078e63dd2b90b2ab40ff024eccb444a48.zip | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5520-pull.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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' ' |