t5520: do not use `pull.rebase=preserve`
Even if those tests try to override that setting, let's not use it because it is deprecated: let's use `merges` instead. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Sep 7, 2021 at 21:05 UTC
6df8755c7b953665bb1960e660fceb5acc2b2a23
1 file changed
+3
-3
t/t5520-pull.sh
+3
-3
@@ -598,7 +598,7 @@ test_expect_success '--rebase=false create a new merge commit' '
598
599
test_expect_success '--rebase=true rebases and flattens keep-merge' '
600
git reset --hard before-preserve-rebase &&
601
- test_config pull.rebase preserve &&
601
+ test_config pull.rebase merges &&
602
git pull --rebase=true . copy &&
603
test_cmp_rev HEAD^^ copy &&
604
echo file3 >expect &&
@@ -620,9 +620,9 @@ test_expect_success '--rebase=invalid fails' '
620
test_must_fail git pull --rebase=invalid . copy
621
'
622
623
-test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
623
+test_expect_success '--rebase overrides pull.rebase=merges and flattens keep-merge' '
624
git reset --hard before-preserve-rebase &&
625
- test_config pull.rebase preserve &&
625
+ test_config pull.rebase merges &&
626
git pull --rebase . copy &&
627
test_cmp_rev HEAD^^ copy &&
628
echo file3 >expect &&