Merge pull request #2074 from emmanuel-ferdman/main

Byron · web-flow · commit 963b6f8bbe04 · 2025-09-30T21:39:17.000+02:00
Fix type hint for `SymbolicReference.reference` property
diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py
@@ -40,6 +40,7 @@
 from git.config import GitConfigParser
 from git.objects.commit import Actor
 from git.refs.log import RefLogEntry
+ from git.refs.reference import Reference
 from git.repo import Repo
 
 
@@ -404,7 +405,7 @@ def object(self) -> AnyGitObject:
 def object(self, object: Union[AnyGitObject, "SymbolicReference", str]) -> "SymbolicReference":
 return self.set_object(object)
 
- def _get_reference(self) -> "SymbolicReference":
+ def _get_reference(self) -> "Reference":
 """
 :return:
 :class:`~git.refs.reference.Reference` object we point to
@@ -416,7 +417,7 @@ def _get_reference(self) -> "SymbolicReference":
 sha, target_ref_path = self._get_ref_info(self.repo, self.path)
 if target_ref_path is None:
 raise TypeError("%s is a detached symbolic reference as it points to %r" % (self, sha))
- return self.from_path(self.repo, target_ref_path)
+ return cast("Reference", self.from_path(self.repo, target_ref_path))
 
 def set_reference(
 self,
@@ -502,7 +503,7 @@ def set_reference(
 
 # Aliased reference
 @property
- def reference(self) -> "SymbolicReference":
+ def reference(self) -> "Reference":
 return self._get_reference()
 
 @reference.setter

-Original file line number
+Diff line change
 fromgit.configimportGitConfigParser
 fromgit.objects.commitimportActor
 fromgit.refs.logimportRefLogEntry
 +fromgit.refs.referenceimportReference
 fromgit.repoimportRepo
 defobject(self, object: Union[AnyGitObject, "SymbolicReference", str]) ->"SymbolicReference":
 returnself.set_object(object)
 -def_get_reference(self) ->"SymbolicReference":
 +def_get_reference(self) ->"Reference":
 """
  :return:
  :class:`~git.refs.reference.Reference` object we point to
 sha, target_ref_path=self._get_ref_info(self.repo, self.path)
 iftarget_ref_pathisNone:
 raiseTypeError("%s is a detached symbolic reference as it points to %r"% (self, sha))
 -returnself.from_path(self.repo, target_ref_path)
 +returncast("Reference", self.from_path(self.repo, target_ref_path))
 defset_reference(
 self,
 # Aliased reference
 @property
 -defreference(self) ->"SymbolicReference":
 +defreference(self) ->"Reference":
 returnself._get_reference()
 @reference.setter