[PATCH 1/8] t5520: do not use `pull.rebase=preserve`
From: Johannes Schindelin via GitGitGadget <hidden>
Date: 2019-11-23 20:50:50
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Johannes Schindelin <redacted> 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 <redacted> --- t/t5520-pull.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index cf4cc32fd0..41b799e336 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh@@ -509,7 +509,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 "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && test file3 = "$(git show HEAD:file3.t)"
@@ -529,9 +529,9 @@ test_expect_success '--rebase=invalid fails' ' ! 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 "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && test file3 = "$(git show HEAD:file3.t)"
--
gitgitgadget