summaryrefslogtreecommitdiff
path: root/tests/worktree/merge.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/worktree/merge.c')
-rw-r--r--tests/worktree/merge.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/worktree/merge.c b/tests/worktree/merge.c
index 36cc2a6c1..4b743829c 100644
--- a/tests/worktree/merge.c
+++ b/tests/worktree/merge.c
@@ -76,7 +76,7 @@ void test_worktree_merge__merge_setup(void)
cl_assert(git_path_exists(path.ptr));
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_reference_free(ours_ref);
git_reference_free(theirs_ref);
git_annotated_commit_free(ours);
@@ -115,7 +115,7 @@ void test_worktree_merge__merge_conflict(void)
cl_git_pass(git_futils_readbuffer(&buf, path.ptr));
cl_assert_equal_s(buf.ptr, CONFLICT_BRANCH_FILE_TXT);
- git_buf_free(&path);
- git_buf_free(&buf);
+ git_buf_dispose(&path);
+ git_buf_dispose(&buf);
}