Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jn/ssh-wrappers'
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index 6071dbfe3466b9c67dcc9b888210cc23816e95d2..612dd7bfb6c7e6ae6f636e0b2e55bfed1aff92f2 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-998,6
+998,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;