diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-01-28 10:27:56 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-01-28 10:25:39 -0800 |
| commit | 891d4a0313edc03f7e2ecb96edec5d30dc182294 (patch) | |
| tree | 6094fbc114bab28699cd076c1ccbee65f64744fa /builtin | |
| parent | Git 2.20.1 (diff) | |
| download | tgif-891d4a0313edc03f7e2ecb96edec5d30dc182294.tar.xz | |
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 'builtin')
| -rw-r--r-- | builtin/rebase.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index b5c99ec10c..2cb3f4a6a9 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -354,7 +354,8 @@ static int run_specific_rebase(struct rebase_options *opts) argv_array_pushf(&child.env_array, "GIT_CHERRY_PICK_HELP=%s", resolvemsg); if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) { - argv_array_push(&child.env_array, "GIT_EDITOR=:"); + argv_array_push(&child.env_array, + "GIT_SEQUENCE_EDITOR=:"); opts->autosquash = 0; } @@ -475,7 +476,7 @@ static int run_specific_rebase(struct rebase_options *opts) if (is_interactive(opts) && !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) { strbuf_addstr(&script_snippet, - "GIT_EDITOR=:; export GIT_EDITOR; "); + "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; "); opts->autosquash = 0; } |