From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Nov 2017 01:57:02 +0000 (+0900)
Subject: Merge branch 'ma/reduce-heads-leakfix' into maint
X-Git-Tag: v2.15.1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/80a0e0fdd6b51744a7c76583874e2993df645e47?hp=-c

Merge branch 'ma/reduce-heads-leakfix' into maint

Leak fixes.

* ma/reduce-heads-leakfix:
reduce_heads: fix memory leaks
builtin/merge-base: free commit lists
---

80a0e0fdd6b51744a7c76583874e2993df645e47
diff --combined builtin/commit.c
index b2a6c7f100,11c4740185..be370f64a9
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -1492,8 -1492,6 +1492,8 @@@ static void print_summary(const char *p
  	diff_setup_done(&rev.diffopt);
  
  	head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
 +	if (!head)
 +		die_errno(_("unable to resolve HEAD after creating commit"));
  	if (!strcmp(head, "HEAD"))
  		head = _("detached HEAD");
  	else
@@@ -1730,7 -1728,7 +1730,7 @@@ int cmd_commit(int argc, const char **a
  				allow_fast_forward = 0;
  		}
  		if (allow_fast_forward)
- 			parents = reduce_heads(parents);
+ 			reduce_heads_replace(&parents);
  	} else {
  		if (!reflog_msg)
  			reflog_msg = (whence == FROM_CHERRY_PICK)