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>
Denton Liu committed
Nov 12, 2019 at 15:08 UTC
2a02262078e63dd2b90b2ab40ff024eccb444a48
1 file changed
+2
-2
t/t5520-pull.sh
+2
-2
@@ -537,7 +537,7 @@ test_expect_success 'pull --rebase=i' '
537
test_expect_success 'pull.rebase=invalid fails' '
538
git reset --hard before-preserve-rebase &&
539
test_config pull.rebase invalid &&
540
- ! git pull . copy
540
+ test_must_fail git pull . copy
541
'
542
543
test_expect_success '--rebase=false create a new merge commit' '
@@ -572,7 +572,7 @@ test_expect_success REBASE_P \
572
573
test_expect_success '--rebase=invalid fails' '
574
git reset --hard before-preserve-rebase &&
575
- ! git pull --rebase=invalid . copy
575
+ test_must_fail git pull --rebase=invalid . copy
576
'
577
578
test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '