merge: small leakfix and code simplification

gitster · gitster · commit 1016658de3fe · 2015-04-29T13:17:52.000-07:00
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 &lt;gitster@pobox.com&gt;
diff --git a/builtin/merge.c b/builtin/merge.c
@@ -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") &&

Original file line number	Diff line number	Diff line change
`@@ -491,8 +491,7 @@ static void merge_name(const char remote, struct strbuf msg)`
`491`	`491`	`}`
`492`	`492`	`if (len) {`
`493`	`493`	`struct strbuf truname = STRBUF_INIT;`
`494`		`- strbuf_addstr(&truname, "refs/heads/");`
`495`		`- strbuf_addstr(&truname, remote);`
	`494`	`+ strbuf_addf(&truname, "refs/heads/%s", remote);`
`496`	`495`	`strbuf_setlen(&truname, truname.len - len);`
`497`	`496`	`if (ref_exists(truname.buf)) {`
`498`	`497`	`strbuf_addf(msg,`
`@@ -503,6 +502,7 @@ static void merge_name(const char remote, struct strbuf msg)`
`503`	`502`	`strbuf_release(&truname);`
`504`	`503`	`goto cleanup;`
`505`	`504`	`}`
	`505`	`+ strbuf_release(&truname);`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`if (!strcmp(remote, "FETCH_HEAD") &&`