From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Sep 2014 19:53:59 +0000 (-0700)
Subject: Merge branch 'mm/log-branch-desc-plug-leak'
X-Git-Tag: v2.2.0-rc0~166
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1bada2b0ccd19ca40c18f01cb4d66675d32d385c;p=thirdparty%2Fgit.git

Merge branch 'mm/log-branch-desc-plug-leak'

* mm/log-branch-desc-plug-leak:
  builtin/log.c: fix minor memory leak
---

1bada2b0ccd19ca40c18f01cb4d66675d32d385c
diff --cc builtin/log.c
index 4389722b4b,308761693e..e4d812208d
--- a/builtin/log.c
+++ b/builtin/log.c
@@@ -861,9 -856,10 +861,10 @@@ static void add_branch_description(stru
  	read_branch_desc(&desc, branch_name);
  	if (desc.len) {
  		strbuf_addch(buf, '\n');
 -		strbuf_add(buf, desc.buf, desc.len);
 +		strbuf_addbuf(buf, &desc);
  		strbuf_addch(buf, '\n');
  	}
+ 	strbuf_release(&desc);
  }
  
  static char *find_branch_name(struct rev_info *rev)