From: Johannes Schindelin Date: Tue, 7 Sep 2021 21:05:02 +0000 (+0000) Subject: t5520: do not use `pull.rebase=preserve` X-Git-Tag: v2.34.0-rc0~53^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6df8755c7b953665bb1960e660fceb5acc2b2a23;p=thirdparty%2Fgit.git 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 Reviewed-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index e2c0c51022..bb9b6b900e 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -598,7 +598,7 @@ test_expect_success '--rebase=false create a new merge commit' ' test_expect_success '--rebase=true rebases and flattens keep-merge' ' git reset --hard before-preserve-rebase && - test_config pull.rebase preserve && + test_config pull.rebase merges && git pull --rebase=true . copy && test_cmp_rev HEAD^^ copy && echo file3 >expect && @@ -620,9 +620,9 @@ test_expect_success '--rebase=invalid fails' ' test_must_fail git pull --rebase=invalid . copy ' -test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' ' +test_expect_success '--rebase overrides pull.rebase=merges and flattens keep-merge' ' git reset --hard before-preserve-rebase && - test_config pull.rebase preserve && + test_config pull.rebase merges && git pull --rebase . copy && test_cmp_rev HEAD^^ copy && echo file3 >expect &&