diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-06-16 19:00:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 16:36:58 (GMT) |
| commit | 76fda6ebbc721e39ed70625206ba1dab5a9c1340 (patch) | |
| tree | 1fcc61994bdafbbde4fd18d35ee5d5db782183a4 /sequencer.c | |
| parent | 3a36ca08818c0ca858de56ad49857b97a509ef2a (diff) | |
| download | git-76fda6ebbc721e39ed70625206ba1dab5a9c1340.zip git-76fda6ebbc721e39ed70625206ba1dab5a9c1340.tar.gz git-76fda6ebbc721e39ed70625206ba1dab5a9c1340.tar.bz2 | |
rebase --root: fix amending root commit messages
The code path that triggered that "BUG" really does not want to run
without an explicit commit message. In the case where we want to amend a
commit message, we have an *implicit* commit message, though: the one of
the commit to amend. Therefore, this code path should not even be
entered.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 8eddda6..0f017c0 100644 --- a/sequencer.c +++ b/sequencer.c @@ -784,7 +784,7 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts, struct child_process cmd = CHILD_PROCESS_INIT; const char *value; - if (flags & CREATE_ROOT_COMMIT) { + if ((flags & CREATE_ROOT_COMMIT) && !(flags & AMEND_MSG)) { struct strbuf msg = STRBUF_INIT, script = STRBUF_INIT; const char *author = is_rebase_i(opts) ? read_author_ident(&script) : NULL; |