undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5520: do not use pull.rebase=preserve

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2021-09-07 21:05:02 +00:00 committed by Junio C Hamano
parent 225bc32a98
commit 6df8755c7b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t5520-pull.sh
View File

@ -598,7 +598,7 @@ test_expect_success '--rebase=false create a new merge commit' '
test_expect_success '--rebase=true rebases and flattens keep-merge' ' test_expect_success '--rebase=true rebases and flattens keep-merge' '
git reset --hard before-preserve-rebase && git reset --hard before-preserve-rebase &&
test_config pull.rebase preserve && test_config pull.rebase merges &&
git pull --rebase=true . copy && git pull --rebase=true . copy &&
test_cmp_rev HEAD^^ copy && test_cmp_rev HEAD^^ copy &&
echo file3 >expect && echo file3 >expect &&
@ -620,9 +620,9 @@ test_expect_success '--rebase=invalid fails' '
test_must_fail git pull --rebase=invalid . copy 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 && git reset --hard before-preserve-rebase &&
test_config pull.rebase preserve && test_config pull.rebase merges &&
git pull --rebase . copy && git pull --rebase . copy &&
test_cmp_rev HEAD^^ copy && test_cmp_rev HEAD^^ copy &&
echo file3 >expect && echo file3 >expect &&