New upstream version 1.3.0+dfsg.1

[libgit2.git] / tests / worktree / merge.c

diff --git a/tests/worktree/merge.c b/tests/worktree/merge.c
index 4b743829cd80639a605a6645dd6077e6a64cc4a4..2a1206032c880b3e6f4b0e58ebb643ba200858ee 100644 (file)
--- a/tests/worktree/merge.c
+++ b/tests/worktree/merge.c
@@ -70,9 +70,9 @@ void test_worktree_merge__merge_setup(void)
                    ours, (const git_annotated_commit **)&theirs, 1));
 
        for (i = 0; i < ARRAY_SIZE(merge_files); i++) {
-               git_buf_clear(&path);
-               cl_git_pass(git_buf_printf(&path, "%s/%s",
-                           fixture.worktree->gitdir, merge_files[i]));
+               cl_git_pass(git_buf_joinpath(&path,
+                           fixture.worktree->gitdir,
+                           merge_files[i]));
                cl_assert(git_path_exists(path.ptr));
        }