summaryrefslogtreecommitdiff
path: root/src/merge.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/merge.c')
-rw-r--r--src/merge.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c
index d7a220499..4a3eb6ff9 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -557,8 +557,7 @@ static int merge_conflict_resolve_automerge(
(error = git_odb_write(&automerge_oid, odb, result.data, result.len, GIT_OBJ_BLOB)) < 0)
goto done;
- if ((index_entry = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry))) == NULL)
-
+ index_entry = git_pool_malloc(&diff_list->pool, sizeof(git_index_entry));
index_entry->path = git_pool_strdup(&diff_list->pool, result.path);
index_entry->file_size = result.len;