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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2016-10-21 14:25:41 +02:00 коммит произвёл Junio C Hamano
Родитель 8f8550b3ec
Коммит 452202c74b
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -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