зеркало из https://github.com/microsoft/git.git
merge: small leakfix and code simplification
When parsing a merged object name like "foo~20" to formulate a merge summary "Merge branch foo (early part)", a temporary strbuf is used, but we forgot to deallocate it when we failed to find the named branch. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
eaa4e59c85
Коммит
1016658de3
|
@ -491,8 +491,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
|
|||
}
|
||||
if (len) {
|
||||
struct strbuf truname = STRBUF_INIT;
|
||||
strbuf_addstr(&truname, "refs/heads/");
|
||||
strbuf_addstr(&truname, remote);
|
||||
strbuf_addf(&truname, "refs/heads/%s", remote);
|
||||
strbuf_setlen(&truname, truname.len - len);
|
||||
if (ref_exists(truname.buf)) {
|
||||
strbuf_addf(msg,
|
||||
|
@ -503,6 +502,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
|
|||
strbuf_release(&truname);
|
||||
goto cleanup;
|
||||
}
|
||||
strbuf_release(&truname);
|
||||
}
|
||||
|
||||
if (!strcmp(remote, "FETCH_HEAD") &&
|
||||
|
|
Загрузка…
Ссылка в новой задаче