Skip to content

Commit 8fe479b

Browse files
authored
Fix worktree test when git dir includes symlinks (#522)
Signed-off-by: James Couball <jcouball@yahoo.com>
1 parent 0cef8ac commit 8fe479b

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

tests/units/test_worktree.rb

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,24 @@ def create_temp_repo(clone_path)
3232

3333
def setup
3434
@git = Git.open(git_working_dir)
35-
35+
3636
@commit = @git.object('1cc8667014381')
3737
@tree = @git.object('1cc8667014381^{tree}')
3838
@blob = @git.object('v2.5:example.txt')
39-
39+
4040
@worktrees = @git.worktrees
4141
end
42-
42+
4343
def test_worktrees_all
4444
assert(@git.worktrees.is_a?(Git::Worktrees))
4545
assert(@git.worktrees.first.is_a?(Git::Worktree))
4646
assert_equal(@git.worktrees.size, 2)
4747
end
48-
48+
4949
def test_worktrees_single
5050
worktree = @git.worktrees.first
51-
assert_equal(worktree.dir, @git.dir.to_s)
51+
git_dir = Pathname.new(@git.dir.to_s).realpath.to_s
52+
assert_equal(worktree.dir, git_dir)
5253
assert_equal(worktree.gcommit, SAMPLE_LAST_COMMIT)
5354
end
5455

0 commit comments

Comments
 (0)