Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Sync with Git 2.14.4
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index ab5ffe85e8f5d7a359004f2bbb52a5778d0b91b4..fbbf2a9e5eb9be47d8574ca0bab175c5a6c0d15d 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-999,6
+999,7
@@
static struct commit_list *reduce_parents(struct commit *head_commit,
/* Find what parents to record by checking independent ones. */
parents = reduce_heads(remoteheads);
+ free_commit_list(remoteheads);
remoteheads = NULL;
remotes = &remoteheads;