Going to leave, we additionally free the author and commit message and make sure to call update_abort_safety_file().
Signed-off-by: Stefan Beller <sbel...@google.com> --- This patch can apply on master. This is a follow up from https://public-inbox.org/git/nycvar.qro.7.76.6.1805311402210...@tvgsbejvaqbjf.bet/ sequencer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index cca968043ea..b98690ecd41 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1773,7 +1773,8 @@ static int do_pick_commit(enum todo_command command, struct commit *commit, res = do_recursive_merge(base, next, base_label, next_label, &head, &msgbuf, opts); if (res < 0) - return res; + goto leave; + res |= write_message(msgbuf.buf, msgbuf.len, git_path_merge_msg(), 0); } else { -- 2.17.0.582.gccdcbd54c44.dirty
