From 9b6d7a6245e3be34a50a94a1174d8aebf5b1a263 Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Wed, 2 Aug 2017 11:44:17 +0100 Subject: rebase -i: honor --rerere-autoupdate Interactive rebase was ignoring '--rerere-autoupdate'. Fix this by reading it appropriate file when restoring the sequencer state for an interactive rebase and passing '--rerere-autoupdate' to merge and cherry-pick when rebasing with '--preserve-merges'. Reported-by: Junio C Hamano Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano --- t/t3418-rebase-continue.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 't') diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 2b746f1559..fcfdd197bd 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -141,5 +141,8 @@ test_rerere_autoupdate () { test_rerere_autoupdate test_rerere_autoupdate -m +GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR +test_rerere_autoupdate -i +test_rerere_autoupdate --preserve-merges test_done -- cgit v1.2.3