diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-26 19:37:01 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-26 19:37:01 +0100 |
| commit | f4afcaa0d50bece4a784ce680d92e5c0d1c67785 (patch) | |
| tree | 3c7fe551e0e18599a152083761cbca71abd17cc1 /src | |
| parent | dc7efa1aef2d3694e7a1955d746d26013402a21d (diff) | |
| parent | 9cb99e8b853bb3d9ddec3748494a0ac34550849b (diff) | |
| download | libgit2-f4afcaa0d50bece4a784ce680d92e5c0d1c67785.tar.gz | |
Merge pull request #2209 from ethomson/cleanup
Cleanup some warnings and mem leaks
Diffstat (limited to 'src')
| -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 42fbd79c9..24b7d37ce 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2629,9 +2629,8 @@ int git_merge( on_error: merge_state_cleanup(repo); - git_index_free(index_new); - done: + git_index_free(index_new); git_index_free(index_repo); git_tree_free(ancestor_tree); |