merge: Do not mallocz unecessary entries
diff --git a/src/merge.c b/src/merge.c
index a124cbd..ac0caea 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -626,7 +626,7 @@
git_oid__cmp(&conflict->our_entry.id, &conflict->their_entry.id) != 0)
return 0;
- if ((merged = git_pool_mallocz(&diff_list->pool, sizeof(git_index_entry))) == NULL)
+ if ((merged = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry))) == NULL)
return -1;
if (ours_changed)
@@ -1383,7 +1383,7 @@
int error = 0;
git_index_entry *entry;
- entry = git_pool_mallocz(&diff_list->pool, sizeof(git_index_entry));
+ entry = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry));
GITERR_CHECK_ALLOC(entry);
if ((error = index_entry_dup_pool(entry, &diff_list->pool, tree_items[0])) >= 0)
