diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-09-08 00:05:02 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-09-08 07:45:32 +0300 |
commit | 6df8755c7b953665bb1960e660fceb5acc2b2a23 (patch) | |
tree | de1d27a9ad1ce4a0f86dcf32fad841dc2e98ad88 /t/t5520-pull.sh | |
parent | 225bc32a989d7a22fa6addafd4ce7dcd04675dbf (diff) |
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>
Diffstat (limited to 't/t5520-pull.sh')
-rwxr-xr-x | t/t5520-pull.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 && |