diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-05 14:26:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-05 14:26:17 -0800 |
| commit | 69dd6e57374f4aa5dcda0736529be47b16a08afe (patch) | |
| tree | 580c5fd6f1360d82a911ac18108a2afd1b9d649a /builtin | |
| parent | Merge branch 'jk/diff-cc-stat-fixes' (diff) | |
| parent | implicit interactive rebase: don't run sequence editor (diff) | |
| download | tgif-69dd6e57374f4aa5dcda0736529be47b16a08afe.tar.xz | |
Merge branch 'pw/no-editor-in-rebase-i-implicit'
When GIT_SEQUENCE_EDITOR is set, the command was incorrectly
started when modes of "git rebase" that implicitly uses the
machinery for the interactive rebase are run, which has been
corrected.
* pw/no-editor-in-rebase-i-implicit:
implicit interactive rebase: don't run sequence editor
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 774264bae8..fdeb41e899 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -355,7 +355,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; } @@ -478,7 +479,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; } |