diff options
Diffstat (limited to 'tests/merge/merge_helpers.c')
| -rw-r--r-- | tests/merge/merge_helpers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/merge/merge_helpers.c b/tests/merge/merge_helpers.c index 4b1b7d262..1b68bdccb 100644 --- a/tests/merge/merge_helpers.c +++ b/tests/merge/merge_helpers.c @@ -43,7 +43,7 @@ int merge_trees_from_branches( error = git_merge_trees(index, repo, ancestor_tree, our_tree, their_tree, opts); - git_buf_free(&branch_buf); + git_buf_dispose(&branch_buf); git_tree_free(our_tree); git_tree_free(their_tree); git_tree_free(ancestor_tree); @@ -75,7 +75,7 @@ int merge_commits_from_branches( error = git_merge_commits(index, repo, our_commit, their_commit, opts); - git_buf_free(&branch_buf); + git_buf_dispose(&branch_buf); git_commit_free(our_commit); git_commit_free(their_commit); @@ -359,7 +359,7 @@ int merge_test_workdir(git_repository *repo, const struct merge_index_entry expe return 0; } - git_buf_free(&wd); + git_buf_dispose(&wd); return 1; } |