diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-01-28 13:27:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-28 21:25:39 +0300 |
| commit | 891d4a0313edc03f7e2ecb96edec5d30dc182294 (patch) | |
| tree | 6094fbc114bab28699cd076c1ccbee65f64744fa /git-legacy-rebase.sh | |
| parent | 0d0ac3826a3bbb9247e39e12623bbcfdd722f24c (diff) | |
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>
Diffstat (limited to 'git-legacy-rebase.sh')
| -rwxr-xr-x | git-legacy-rebase.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-legacy-rebase.sh b/git-legacy-rebase.sh index b4c7dbfa57..41f7799bb5 100755 --- a/git-legacy-rebase.sh +++ b/git-legacy-rebase.sh @@ -168,8 +168,8 @@ run_interactive () { run_specific_rebase () { if [ "$interactive_rebase" = implied ]; then - GIT_EDITOR=: - export GIT_EDITOR + GIT_SEQUENCE_EDITOR=: + export GIT_SEQUENCE_EDITOR autosquash= fi |