diff options
Diffstat (limited to 'src/diff_tform.c')
| -rw-r--r-- | src/diff_tform.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/diff_tform.c b/src/diff_tform.c index 437144ae2..7de88bd0d 100644 --- a/src/diff_tform.c +++ b/src/diff_tform.c @@ -136,11 +136,10 @@ int git_diff__merge( return -1; } - if (git_vector_init(&onto_new, onto->deltas.length, git_diff_delta__cmp) < 0) + if (git_vector_init(&onto_new, onto->deltas.length, git_diff_delta__cmp) < 0 || + git_pool_init(&onto_pool, 1) < 0) return -1; - git_pool_init(&onto_pool, 1); - for (i = 0, j = 0; i < onto->deltas.length || j < from->deltas.length; ) { git_diff_delta *o = GIT_VECTOR_GET(&onto->deltas, i); const git_diff_delta *f = GIT_VECTOR_GET(&from->deltas, j); |