rerere: recalculate conflict ID when unresolved conflict is committed

diff --git a/sequencer.c b/sequencer.c
index ee1f7b2df74572b1bff71436fa7961f47ac25378..5354d4d51e62a31d5254334851bce1b5bb5558a9 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -176,6 +176,7 @@ static int git_sequencer_config(const char *k, const char *v, void *cb)
                        warning(_("invalid commit message cleanup mode '%s'"),
                                  s);
 
+               free((char *)s);
                return status;
        }
 
@@ -1774,7 +1775,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 {