Skip to content

Commit

Permalink
tests: verify renaming branch really updates worktree HEAD
Browse files Browse the repository at this point in the history
In case where a branch is getting renamed, all HEADs of the main
repository and of its worktrees that point to the old branch need to get
updated to point to the new branch. We already do so and have a test for
this, but the test only verifies that we're able to lookup the updated
HEAD, not what it contains.

Let's make the test more specific by verifying the updated HEAD also has
the correct updated symbolic target.
  • Loading branch information
pks-t committed Jul 12, 2020
1 parent 5434f9a commit ce4cb07
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion tests/worktree/refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ void test_worktree_refs__renaming_reference_updates_worktree_heads(void)
cl_git_pass(git_branch_lookup(&branch, fixture.repo,
"testrepo-worktree", GIT_BRANCH_LOCAL));
cl_git_pass(git_reference_rename(&renamed, branch, "refs/heads/renamed", 0, NULL));
cl_git_pass(git_repository_head(&head, fixture.worktree));

cl_git_pass(git_reference_lookup(&head, fixture.worktree, GIT_HEAD_FILE));
cl_assert_equal_i(git_reference_type(head), GIT_REFERENCE_SYMBOLIC);
cl_assert_equal_s(git_reference_symbolic_target(head), "refs/heads/renamed");

git_reference_free(head);
git_reference_free(branch);
Expand Down

0 comments on commit ce4cb07

Please sign in to comment.