|
@@ -182,16 +182,17 @@ class WorkingTreeTestCase(ObjectStoreTestCase):
|
|
worktrees = self._parse_worktree_list(output)
|
|
worktrees = self._parse_worktree_list(output)
|
|
self.assertEqual(len(worktrees), self._number_of_working_tree)
|
|
self.assertEqual(len(worktrees), self._number_of_working_tree)
|
|
self.assertEqual(worktrees[0][1], '(bare)')
|
|
self.assertEqual(worktrees[0][1], '(bare)')
|
|
- self.assertEqual(os.path.normcase(worktrees[0][0]),
|
|
|
|
- os.path.normcase(self._mainworktree_repo.path))
|
|
|
|
|
|
+ self.assertTrue(
|
|
|
|
+ os.path.samefile(worktrees[0][0], self._mainworktree_repo.path))
|
|
|
|
|
|
output = run_git_or_fail(
|
|
output = run_git_or_fail(
|
|
['worktree', 'list'], cwd=self._mainworktree_repo.path)
|
|
['worktree', 'list'], cwd=self._mainworktree_repo.path)
|
|
worktrees = self._parse_worktree_list(output)
|
|
worktrees = self._parse_worktree_list(output)
|
|
self.assertEqual(len(worktrees), self._number_of_working_tree)
|
|
self.assertEqual(len(worktrees), self._number_of_working_tree)
|
|
self.assertEqual(worktrees[0][1], '(bare)')
|
|
self.assertEqual(worktrees[0][1], '(bare)')
|
|
- self.assertEqual(os.path.normcase(worktrees[0][0]),
|
|
|
|
- os.path.normcase(self._mainworktree_repo.path))
|
|
|
|
|
|
+ self.assertTrue(os.path.samefile(
|
|
|
|
+ worktrees[0][0],
|
|
|
|
+ self._mainworktree_repo.path))
|
|
|
|
|
|
|
|
|
|
class InitNewWorkingDirectoryTestCase(WorkingTreeTestCase):
|
|
class InitNewWorkingDirectoryTestCase(WorkingTreeTestCase):
|