diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2017-08-02 11:44:17 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-02 15:16:09 -0700 |
| commit | 9b6d7a6245e3be34a50a94a1174d8aebf5b1a263 (patch) | |
| tree | ada9dbb48cea17aa8df9e45192fafdac35e1fc0b /t | |
| parent | rebase: honor --rerere-autoupdate (diff) | |
| download | tgif-9b6d7a6245e3be34a50a94a1174d8aebf5b1a263.tar.xz | |
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 <gitster@pobox.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 3 |
1 files changed, 3 insertions, 0 deletions
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 |