summaryrefslogtreecommitdiff
path: root/tests/worktree/worktree.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/worktree/worktree.c')
-rw-r--r--tests/worktree/worktree.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/worktree/worktree.c b/tests/worktree/worktree.c
index cbdd0847d..83be09760 100644
--- a/tests/worktree/worktree.c
+++ b/tests/worktree/worktree.c
@@ -70,7 +70,7 @@ void test_worktree_worktree__list_with_invalid_worktree_dirs(void)
}
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_worktree_worktree__list_in_worktree_repo(void)
@@ -123,7 +123,7 @@ void test_worktree_worktree__lookup(void)
cl_assert_equal_s(wt->commondir_path, fixture.repo->gitdir);
cl_assert_equal_s(wt->commondir_path, fixture.repo->commondir);
- git_buf_free(&gitdir_path);
+ git_buf_dispose(&gitdir_path);
git_worktree_free(wt);
}
@@ -165,8 +165,8 @@ void test_worktree_worktree__open_invalid_commondir(void)
cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
cl_git_fail(git_repository_open_from_worktree(&repo, wt));
- git_buf_free(&buf);
- git_buf_free(&path);
+ git_buf_dispose(&buf);
+ git_buf_dispose(&path);
git_worktree_free(wt);
}
@@ -185,8 +185,8 @@ void test_worktree_worktree__open_invalid_gitdir(void)
cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
cl_git_fail(git_repository_open_from_worktree(&repo, wt));
- git_buf_free(&buf);
- git_buf_free(&path);
+ git_buf_dispose(&buf);
+ git_buf_dispose(&path);
git_worktree_free(wt);
}
@@ -203,7 +203,7 @@ void test_worktree_worktree__open_invalid_parent(void)
cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
cl_git_fail(git_repository_open_from_worktree(&repo, wt));
- git_buf_free(&buf);
+ git_buf_dispose(&buf);
git_worktree_free(wt);
}
@@ -222,7 +222,7 @@ void test_worktree_worktree__init(void)
cl_assert(git__suffixcmp(git_repository_workdir(repo), "worktree-new/") == 0);
cl_git_pass(git_branch_lookup(&branch, repo, "worktree-new", GIT_BRANCH_LOCAL));
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_worktree_free(wt);
git_reference_free(branch);
git_repository_free(repo);
@@ -267,7 +267,7 @@ void test_worktree_worktree__add_locked(void)
cl_assert(git__suffixcmp(git_repository_workdir(repo), "worktree-locked/") == 0);
cl_git_pass(git_branch_lookup(&branch, repo, "worktree-locked", GIT_BRANCH_LOCAL));
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_worktree_free(wt);
git_reference_free(branch);
git_repository_free(repo);
@@ -287,7 +287,7 @@ void test_worktree_worktree__init_existing_branch(void)
cl_git_pass(git_buf_joinpath(&path, fixture.repo->workdir, "../worktree-new"));
cl_git_fail(git_worktree_add(&wt, fixture.repo, "worktree-new", path.ptr, NULL));
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_commit_free(commit);
git_reference_free(head);
git_reference_free(branch);
@@ -314,7 +314,7 @@ void test_worktree_worktree__add_with_explicit_branch(void)
cl_git_pass(git_repository_head(&wthead, wtrepo));
cl_assert_equal_s(git_reference_name(wthead), "refs/heads/worktree-with-ref");
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_commit_free(commit);
git_reference_free(head);
git_reference_free(branch);
@@ -335,7 +335,7 @@ void test_worktree_worktree__init_existing_worktree(void)
cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
cl_assert_equal_s(wt->gitlink_path, fixture.worktree->gitlink);
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_worktree_free(wt);
}
@@ -364,7 +364,7 @@ void test_worktree_worktree__init_existing_path(void)
cl_assert(!git_path_exists(path.ptr));
}
- git_buf_free(&path);
+ git_buf_dispose(&path);
}
void test_worktree_worktree__init_submodule(void)
@@ -390,7 +390,7 @@ void test_worktree_worktree__init_submodule(void)
cl_git_pass(git_buf_joinpath(&path, sm->gitdir, "worktrees/repo-worktree/"));
cl_assert_equal_s(path.ptr, wt->gitdir);
- git_buf_free(&path);
+ git_buf_dispose(&path);
git_worktree_free(worktree);
git_repository_free(sm);
git_repository_free(wt);
@@ -424,8 +424,8 @@ void test_worktree_worktree__path(void)
cl_git_pass(git_buf_joinpath(&expected_path, clar_sandbox_path(), "testrepo-worktree"));
cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree"));
cl_assert_equal_s(git_worktree_path(wt), expected_path.ptr);
-
- git_buf_free(&expected_path);
+
+ git_buf_dispose(&expected_path);
git_worktree_free(wt);
}
@@ -482,7 +482,7 @@ void test_worktree_worktree__lock_with_reason(void)
cl_assert_equal_s(reason.ptr, "because");
cl_assert(wt->locked);
- git_buf_free(&reason);
+ git_buf_dispose(&reason);
git_worktree_free(wt);
}
@@ -499,7 +499,7 @@ void test_worktree_worktree__lock_without_reason(void)
cl_assert_equal_i(reason.size, 0);
cl_assert(wt->locked);
- git_buf_free(&reason);
+ git_buf_dispose(&reason);
git_worktree_free(wt);
}