fmt-merge-msg: avoid leaking strbuf in shortlog()

rscharfe · gitster · commit addcf6cfdeb2 · 2017-12-07T12:34:35.000-08:00
Use string_list_append_nodup() instead of string_list_append() to hand
over ownership of a detached strbuf and thus avoid leaking its memory.

Signed-off-by: Rene Scharfe &lt;l.s.r@web.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
@@ -376,7 +376,8 @@ static void shortlog(const char *name,
 			string_list_append(&subjects,
 					   oid_to_hex(&commit->object.oid));
 		else
-			string_list_append(&subjects, strbuf_detach(&sb, NULL));
+			string_list_append_nodup(&subjects,
+						 strbuf_detach(&sb, NULL));
 	}
 
 	if (opts->credit_people)

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,8 @@ static void shortlog(const char *name,`
`376`	`376`	`string_list_append(&subjects,`
`377`	`377`	`oid_to_hex(&commit->object.oid));`
`378`	`378`	`else`
`379`		`- string_list_append(&subjects, strbuf_detach(&sb, NULL));`
	`379`	`+ string_list_append_nodup(&subjects,`
	`380`	`+ strbuf_detach(&sb, NULL));`
`380`	`381`	`}`
`381`	`382`
`382`	`383`	`if (opts->credit_people)`