diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit-graph.c | 1 | ||||
| -rw-r--r-- | builtin/merge.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index f5e66e9969..45d035af60 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -328,6 +328,7 @@ cleanup: FREE_AND_NULL(options); string_list_clear(&pack_indexes, 0); strbuf_release(&buf); + oidset_clear(&commits); return result; } diff --git a/builtin/merge.c b/builtin/merge.c index 8f397cbeff..d748d46e13 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1632,6 +1632,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) for (j = remoteheads; j; j = j->next) { struct commit_list *common_one; + struct commit *common_item; /* * Here we *have* to calculate the individual @@ -1641,7 +1642,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix) common_one = repo_get_merge_bases(the_repository, head_commit, j->item); - if (!oideq(&common_one->item->object.oid, &j->item->object.oid)) { + common_item = common_one->item; + free_commit_list(common_one); + if (!oideq(&common_item->object.oid, &j->item->object.oid)) { up_to_date = 0; break; } |