]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/rebase.c
implicit interactive rebase: don't run sequence editor
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Mon, 28 Jan 2019 10:27:56 +0000 (10:27 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2019 18:25:39 +0000 (10:25 -0800)
commit891d4a0313edc03f7e2ecb96edec5d30dc182294
tree6094fbc114bab28699cd076c1ccbee65f64744fa
parent0d0ac3826a3bbb9247e39e12623bbcfdd722f24c
implicit interactive rebase: don't run sequence editor

If GIT_SEQUENCE_EDITOR is set then rebase runs it when executing
implicit interactive rebases which are supposed to appear
non-interactive to the user. Fix this by setting GIT_SEQUENCE_EDITOR=:
rather than GIT_EDITOR=:. A couple of tests relied on the old behavior
so they are updated to work with the new regime.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c
git-legacy-rebase.sh
t/t3404-rebase-interactive.sh
t/t3430-rebase-merges.sh
t/t7505-prepare-commit-msg-hook.sh