sequencer: stop releasing the strbuf in write_message()

Nothing in the name "write_message()" suggests that the function
releases the strbuf passed to it. So let's release the strbuf in the
caller instead.

Signed-off-by: Johannes Schindelin <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/sequencer.c b/sequencer.c
index d74fdce99b9b9b0fbcdd3a37f85a49148515dcac..745c86f6541053014dddcb1a5774982bbbdc40f5 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -243,7 +243,6 @@ static int write_message(struct strbuf *msgbuf, const char *filename)
                return error_errno(_("Could not lock '%s'"), filename);
        if (write_in_full(msg_fd, msgbuf->buf, msgbuf->len) < 0)
                return error_errno(_("Could not write to %s"), filename);
-       strbuf_release(msgbuf);
        if (commit_lock_file(&msg_file) < 0)
                return error(_("Error wrapping up %s."), filename);
 
@@ -759,6 +758,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
                free_commit_list(common);
                free_commit_list(remotes);
        }
+       strbuf_release(&msgbuf);
 
        /*
         * If the merge was clean or if it failed due to conflict, we write