зеркало из https://github.com/microsoft/git.git
merge: release strbuf after use in write_merge_heads()
Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
150888e273
Коммит
814c4b3747
|
@ -938,6 +938,7 @@ static void write_merge_heads(struct commit_list *remoteheads)
|
|||
if (fast_forward == FF_NO)
|
||||
strbuf_addstr(&buf, "no-ff");
|
||||
write_file_buf(git_path_merge_mode(), buf.buf, buf.len);
|
||||
strbuf_release(&buf);
|
||||
}
|
||||
|
||||
static void write_merge_state(struct commit_list *remoteheads)
|
||||
|
|
Загрузка…
Ссылка в новой задаче