|
15 | 15 |
|
16 | 16 | # typing --------------------------------------------------- |
17 | 17 |
|
18 | | -from typing import Any, Sequence, Union, TYPE_CHECKING |
| 18 | +from typing import Any, Sequence, TYPE_CHECKING, Union |
19 | 19 |
|
20 | | -from git.types import PathLike, Old_commit_ish |
| 20 | +from git.types import Commit_ish, PathLike |
21 | 21 |
|
22 | 22 | if TYPE_CHECKING: |
23 | | - from git.repo import Repo |
24 | 23 | from git.objects import Commit |
25 | 24 | from git.refs import RemoteReference |
| 25 | + from git.repo import Repo |
26 | 26 |
|
27 | 27 | # ------------------------------------------------------------------- |
28 | 28 |
|
@@ -62,7 +62,7 @@ def orig_head(self) -> SymbolicReference: |
62 | 62 |
|
63 | 63 | def reset( |
64 | 64 | self, |
65 | | - commit: Union[Old_commit_ish, SymbolicReference, str] = "HEAD", |
| 65 | + commit: Union[Commit_ish, SymbolicReference, str] = "HEAD", |
66 | 66 | index: bool = True, |
67 | 67 | working_tree: bool = False, |
68 | 68 | paths: Union[PathLike, Sequence[PathLike], None] = None, |
@@ -99,7 +99,7 @@ def reset( |
99 | 99 | if index: |
100 | 100 | mode = "--mixed" |
101 | 101 |
|
102 | | - # Tt appears some git versions declare mixed and paths deprecated. |
| 102 | + # It appears some git versions declare mixed and paths deprecated. |
103 | 103 | # See http://github.com/Byron/GitPython/issues#issue/2. |
104 | 104 | if paths: |
105 | 105 | mode = None |
|
0 commit comments