diff mbox series

[1/8] t5520: do not use `pull.rebase=preserve`

Message ID 662e16dbc1246ac5737723134471f47e4f582fc1.1574542242.git.gitgitgadget@gmail.com (mailing list archive)
State New, archived
Headers show
Series Drop support for git rebase --preserve-merges | expand

Commit Message

Koji Nakamaru via GitGitGadget Nov. 23, 2019, 8:50 p.m. UTC 
From: Johannes Schindelin <johannes.schindelin@gmx.de>

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>
---
 t/t5520-pull.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

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)"