diff options
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index 944dea6997..c4e4418559 100644 --- a/sequencer.c +++ b/sequencer.c @@ -795,11 +795,18 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts, 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; + const char *author = NULL; struct object_id root_commit, *cache_tree_oid; int res = 0; + if (is_rebase_i(opts)) { + author = read_author_ident(&script); + if (!author) { + strbuf_release(&script); + return -1; + } + } + if (!defmsg) BUG("root commit without message"); |