Merge pull request #2039 from EliahKagan/flatten-next

EliahKagan · web-flow · commit 5b098ff41266 · 2025-06-07T12:21:36.000-04:00
Fix Git.{AutoInterrupt,CatFileContentStream} static typing
diff --git a/git/cmd.py b/git/cmd.py
@@ -60,6 +60,11 @@
     overload,
 )
 
+if sys.version_info >= (3, 10):
+    from typing import TypeAlias
+else:
+    from typing_extensions import TypeAlias
+
 from git.types import Literal, PathLike, TBD
 
 if TYPE_CHECKING:
@@ -952,9 +957,9 @@ def check_unsafe_options(cls, options: List[str], unsafe_options: List[str]) ->
                         f"{unsafe_option} is not allowed, use `allow_unsafe_options=True` to allow it."
                     )
 
-    AutoInterrupt = _AutoInterrupt
+    AutoInterrupt: TypeAlias = _AutoInterrupt
 
-    CatFileContentStream = _CatFileContentStream
+    CatFileContentStream: TypeAlias = _CatFileContentStream
 
     def __init__(self, working_dir: Union[None, PathLike] = None) -> None:
         """Initialize this instance with:
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
 gitdb>=4.0.1,<5
-typing-extensions>=3.7.4.3;python_version<"3.8"
+typing-extensions>=3.10.0.2;python_version<"3.10"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`gitdb>=4.0.1,<5`
`2`		`-typing-extensions>=3.7.4.3;python_version<"3.8"`
	`2`	`+typing-extensions>=3.10.0.2;python_version<"3.10"`