mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/plug-empty-tree-leak'

Browse Source 
* jn/plug-empty-tree-leak:
  merge-recursive: take advantage of hardcoded empty tree
  revert: plug memory leak in "cherry-pick root commit" codepath
This commit is contained in:
Junio C Hamano
2011-08-25 16:00:29 -07:00
parent 22f6578975 03f622c81f
commit 7abd8fb36d
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
merge-recursive.c
View File

@ -1601,12 +1601,10 @@ int merge_recursive(struct merge_options *o,
merged_common_ancestors = pop_commit(&ca);
if (merged_common_ancestors == NULL) {
/* if there is no common ancestor, make an empty tree */
struct tree *tree = xcalloc(1, sizeof(struct tree));
/* if there is no common ancestor, use an empty tree */
struct tree *tree;
tree->object.parsed = 1;
tree->object.type = OBJ_TREE;
pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1);
tree = lookup_tree((const unsigned char *)EMPTY_TREE_SHA1_BIN);
merged_common_ancestors = make_virtual_commit(tree, "ancestor");
}