From b8be6a30b99f5f73a04a720f915e93c84694151d Mon Sep 17 00:00:00 2001 From: Vicent Marti Date: Wed, 15 Jan 2014 16:57:29 +0100 Subject: ffffuuu another broken one --- src/merge.c | 3 +-- 1 file changed, 1 insertion(+), 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; -- cgit v1.2.1