mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'rs/plug-strbuf-leak-in-merge'
* rs/plug-strbuf-leak-in-merge: merge: release strbuf after use in suggest_conflicts()
This commit is contained in:
commit
d61e79050c
|
@ -894,6 +894,7 @@ static int suggest_conflicts(void)
|
|||
|
||||
append_conflicts_hint(&msgbuf);
|
||||
fputs(msgbuf.buf, fp);
|
||||
strbuf_release(&msgbuf);
|
||||
fclose(fp);
|
||||
rerere(allow_rerere_auto);
|
||||
printf(_("Automatic merge failed; "
|
||||
|
|
Loading…
Reference in a new issue