diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 1c55e797b..7031efcc7 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1550,8 +1550,10 @@ git_merge_diff_list *git_merge_diff_list__alloc(git_repository *repo) if (git_vector_init(&diff_list->staged, 0, NULL) < 0 || git_vector_init(&diff_list->conflicts, 0, NULL) < 0 || git_vector_init(&diff_list->resolved, 0, NULL) < 0 || - git_pool_init(&diff_list->pool, 1, 0) < 0) + git_pool_init(&diff_list->pool, 1, 0) < 0) { + git_merge_diff_list__free(diff_list); return NULL; + } return diff_list; } |