Cover drive-rooted paths across Windows consumers

Author: codex

test/test_config.py

@@ -373,6 +373,21 @@ def test_config_relative_path_include(self, rw_dir):
         with GitConfigParser(relative_config_path, read_only=True) as cr:
             assert cr.get_value("included", "value") == "included"
 
+    @pytest.mark.skipif(os.name != "nt", reason="Specifically for Windows drive-rooted paths.")
+    @with_rw_directory
+    def test_config_drive_rooted_path_include(self, rw_dir):
+        included_path = osp.join(rw_dir, "included")
+        with GitConfigParser(included_path, read_only=False) as cw:
+            cw.set_value("included", "value", "included")
+
+        _drive, rooted_included_path = osp.splitdrive(included_path)
+        config_path = osp.join(rw_dir, "config")
+        with GitConfigParser(config_path, read_only=False) as cw:
+            cw.set_value("include", "path", rooted_included_path)
+
+        with GitConfigParser(config_path, read_only=True) as cr:
+            assert cr.get_value("included", "value") == "included"
+
     @with_rw_directory
     def test_multiple_include_paths_with_same_key(self, rw_dir):
         """Test that multiple 'path' entries under [include] are all respected.

test/test_repo.py

@@ -234,6 +234,17 @@ def test_clone_from_keeps_env(self, rw_dir):
 
         self.assertEqual(environment, cloned.git.environment())
 
+    @pytest.mark.skipif(os.name != "nt", reason="Specifically for Windows drive-rooted paths.")
+    @with_rw_directory
+    def test_clone_from_drive_rooted_destination(self, rw_dir):
+        original_repo = Repo.init(osp.join(rw_dir, "repo"))
+        destination = osp.join(rw_dir, "clone")
+        _drive, rooted_destination = osp.splitdrive(destination)
+
+        cloned = Repo.clone_from(original_repo.git_dir, rooted_destination)
+
+        assert osp.samefile(cloned.working_tree_dir, destination)
+
     @with_rw_directory
     def test_date_format(self, rw_dir):
         repo = Repo.init(osp.join(rw_dir, "repo"))
@@ -1222,6 +1233,25 @@ def test_git_work_tree_dotgit_relative(self):
         # test_git_work_tree_dotgit; delegate instead
         self.test_git_work_tree_dotgit(use_relative_paths=True)
 
+    @pytest.mark.skipif(os.name != "nt", reason="Specifically for Windows drive-rooted paths.")
+    @with_rw_directory
+    def test_linked_worktree_drive_rooted_gitdir_file(self, rw_dir):
+        main_repo = self.rorepo.clone(join_path_native(rw_dir, "main_repo"))
+        branch = main_repo.create_head("drive-rooted-worktree")
+        worktree_path = join_path_native(rw_dir, "worktree_repo")
+        main_repo.git.worktree("add", worktree_path, branch.name)
+
+        linked_repo = Repo(worktree_path)
+        gitdir_file = osp.join(linked_repo.git_dir, "gitdir")
+        worktree_gitfile = osp.join(worktree_path, ".git")
+        _drive, rooted_worktree_gitfile = osp.splitdrive(worktree_gitfile)
+        with open(gitdir_file, "w") as stream:
+            stream.write(rooted_worktree_gitfile)
+
+        reopened_repo = Repo(linked_repo.git_dir)
+
+        assert osp.samefile(reopened_repo.working_tree_dir, worktree_path)
+
     @with_rw_directory
     def test_git_work_tree_env(self, rw_dir):
         """Check that we yield to GIT_WORK_TREE."""

test/test_submodule.py

@@ -1296,6 +1296,20 @@ class Repo:
         self.assertRaises(ValueError, Submodule._to_relative_path, Repo(), R"\\server\share\outside")
         self.assertRaises(ValueError, Submodule._to_relative_path, Repo(), R"\\?\C:\outside")
 
+    @skipUnless(sys.platform == "win32", "Specifically for Windows.")
+    @with_rw_directory
+    def test_find_submodule_git_dir_with_drive_rooted_gitfile(self, rwdir):
+        module = git.Repo.init(osp.join(rwdir, "module"))
+        _drive, rooted_git_dir = osp.splitdrive(module.git_dir)
+        gitfile = osp.join(rwdir, "gitfile")
+        with open(gitfile, "w") as stream:
+            stream.write(f"gitdir: {rooted_git_dir}")
+
+        resolved_git_dir = find_submodule_git_dir(gitfile)
+
+        assert resolved_git_dir is not None
+        assert osp.samefile(resolved_git_dir, module.git_dir)
+
     @pytest.mark.xfail(
         reason="for some unknown reason the assertion fails, even though it in fact is working in more common setup",
         raises=AssertionError,

test/test_util.py

@@ -407,6 +407,10 @@ def __repr__(self):
 class TestUtils(TestBase):
     """Tests for most utilities in :mod:`git.util`."""
 
+    @pytest.mark.skipif(os.name != "nt", reason="Specifically for Windows drive-rooted paths.")
+    def test_cygpath_drive_rooted_path(self):
+        assert cygpath(R"\directory\file") == "/directory/file"
+
     def test_it_should_dashify(self):
         self.assertEqual("this-is-my-argument", dashify("this_is_my_argument"))
         self.assertEqual("foo", dashify("foo"))