diff options
| author | Vicent Marti <tanoku@gmail.com> | 2014-01-15 16:57:29 +0100 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2014-01-15 16:57:29 +0100 |
| commit | b8be6a30b99f5f73a04a720f915e93c84694151d (patch) | |
| tree | d76541eb6ed928089c86e2b927518e5275a53b27 | |
| parent | 1dd48fec7068dda2c7a580668c72cf76a5260c63 (diff) | |
| download | libgit2-vmg/panic.tar.gz | |
ffffuuu another broken onevmg/panic
| -rw-r--r-- | src/merge.c | 3 |
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; |