From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Jun 2015 19:00:05 +0000 (-0700)
Subject: Merge branch 'jc/plug-fmt-merge-msg-leak' into maint
X-Git-Tag: v2.4.3~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdf204f28db5cdf5201dded37c5b40f3f432e0cf;p=git

Merge branch 'jc/plug-fmt-merge-msg-leak' into maint

* jc/plug-fmt-merge-msg-leak:
  fmt-merge-msg: plug small leak of commit buffer
---

bdf204f28db5cdf5201dded37c5b40f3f432e0cf
diff --cc builtin/fmt-merge-msg.c
index 1d962dc569,9953007ef9..05f4c26311
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@@ -256,6 -257,15 +253,15 @@@ static void record_person_from_buf(int 
  	free(name_buf);
  }
  
+ 
+ static void record_person(int which, struct string_list *people,
+ 			  struct commit *commit)
+ {
 -	const char *buffer = get_commit_buffer(commit);
++	const char *buffer = get_commit_buffer(commit, NULL);
+ 	record_person_from_buf(which, people, buffer);
+ 	unuse_commit_buffer(commit, buffer);
+ }
+ 
  static int cmp_string_list_util_as_integral(const void *a_, const void *b_)
  {
  	const struct string_list_item *a = a_, *b = b_;