|
11 | 11 | import glob |
12 | 12 | from io import BytesIO |
13 | 13 | import os |
| 14 | +import os.path as osp |
14 | 15 | from stat import S_ISLNK |
15 | 16 | import subprocess |
16 | 17 | import sys |
17 | 18 | import tempfile |
18 | 19 |
|
19 | | -from git.compat import ( |
20 | | - force_bytes, |
21 | | - defenc, |
22 | | -) |
23 | | -from git.exc import GitCommandError, CheckoutError, GitError, InvalidGitRepositoryError |
24 | | -from git.objects import ( |
25 | | - Blob, |
26 | | - Submodule, |
27 | | - Tree, |
28 | | - Object, |
29 | | - Commit, |
30 | | -) |
| 20 | +from git.compat import defenc, force_bytes |
| 21 | +import git.diff as git_diff |
| 22 | +from git.exc import CheckoutError, GitCommandError, GitError, InvalidGitRepositoryError |
| 23 | +from git.objects import Blob, Commit, Object, Submodule, Tree |
31 | 24 | from git.objects.util import Serializable |
32 | 25 | from git.util import ( |
33 | 26 | LazyMixin, |
|
41 | 34 | from gitdb.base import IStream |
42 | 35 | from gitdb.db import MemoryDB |
43 | 36 |
|
44 | | -import git.diff as git_diff |
45 | | -import os.path as osp |
46 | | - |
47 | 37 | from .fun import ( |
| 38 | + S_IFGITLINK, |
| 39 | + aggressive_tree_merge, |
48 | 40 | entry_key, |
49 | | - write_cache, |
50 | 41 | read_cache, |
51 | | - aggressive_tree_merge, |
52 | | - write_tree_from_cache, |
53 | | - stat_mode_to_index_mode, |
54 | | - S_IFGITLINK, |
55 | 42 | run_commit_hook, |
| 43 | + stat_mode_to_index_mode, |
| 44 | + write_cache, |
| 45 | + write_tree_from_cache, |
56 | 46 | ) |
57 | | -from .typ import ( |
58 | | - BaseIndexEntry, |
59 | | - IndexEntry, |
60 | | - StageType, |
61 | | -) |
| 47 | +from .typ import BaseIndexEntry, IndexEntry, StageType |
62 | 48 | from .util import TemporaryFileSwap, post_clear_cache, default_index, git_working_dir |
63 | 49 |
|
64 | 50 | # typing ----------------------------------------------------------------------------- |
|
80 | 66 | Union, |
81 | 67 | ) |
82 | 68 |
|
83 | | -from git.types import Old_commit_ish, Literal, PathLike |
| 69 | +from git.types import Literal, PathLike |
84 | 70 |
|
85 | 71 | if TYPE_CHECKING: |
86 | 72 | from subprocess import Popen |
87 | | - from git.repo import Repo |
| 73 | + |
88 | 74 | from git.refs.reference import Reference |
| 75 | + from git.repo import Repo |
89 | 76 | from git.util import Actor |
90 | 77 |
|
91 | 78 |
|
@@ -1127,7 +1114,7 @@ def move( |
1127 | 1114 | def commit( |
1128 | 1115 | self, |
1129 | 1116 | message: str, |
1130 | | - parent_commits: Union[Old_commit_ish, None] = None, |
| 1117 | + parent_commits: Union[List[Commit], None] = None, |
1131 | 1118 | head: bool = True, |
1132 | 1119 | author: Union[None, "Actor"] = None, |
1133 | 1120 | committer: Union[None, "Actor"] = None, |
|
0 commit comments