gitpython-developers
diff --git a/‎git/repo/fun.py‎
Lines changed: 4 additions & 1 deletion b/‎git/repo/fun.py‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎test/test_repo.py‎
Lines changed: 11 additions & 0 deletions b/‎test/test_repo.py‎
Lines changed: 11 additions & 0 deletions
@@ -87,9 +87,12 @@ def is_git_dir(d: PathLike) -> bool:
         if common_dir == "":
             return False
         if common_dir is None:
+            common_dir_file = Path(d) / "commondir"
             try:
-                common_dir = os.fsdecode((Path(d) / "commondir").read_bytes()).rstrip("\r\n")
+                common_dir = os.fsdecode(common_dir_file.read_bytes()).rstrip("\r\n")
             except FileNotFoundError:
+                if osp.lexists(common_dir_file):
+                    return False
                 common_dir = os.fspath(d)
             except OSError:
                 return False
 
@@ -181,6 +181,17 @@ def test_repo_discovery_rejects_invalid_metadata(self):
                 with self.subTest(metadata=".git", contents=contents):
                     self.assertRaises(InvalidGitRepositoryError, Repo, path)
 
+    @requires_symlinks
+    def test_repo_discovery_rejects_dangling_commondir(self):
+        with tempfile.TemporaryDirectory() as tdir:
+            path = Path(tdir)
+            (path / "objects").mkdir()
+            (path / "refs").mkdir()
+            (path / "HEAD").write_text("ref: refs/heads/main\n")
+            (path / "commondir").symlink_to("missing")
+
+            self.assertRaises(InvalidGitRepositoryError, Repo, path)
+
     def test_repo_discovery_uses_storage_environment(self):
         with tempfile.TemporaryDirectory() as tdir:
             git_dir = Path(tdir) / "git"