diff options
Diffstat (limited to 'git/index')
| -rw-r--r-- | git/index/base.py | 2 | ||||
| -rw-r--r-- | git/index/util.py | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/git/index/base.py b/git/index/base.py index 54f73617..2bb62f32 100644 --- a/git/index/base.py +++ b/git/index/base.py @@ -272,7 +272,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): return self @classmethod - def new(cls, repo: 'Repo', *tree_sha: bytes) -> 'IndexFile': + def new(cls, repo: 'Repo', *tree_sha: Union[str, Tree]) -> 'IndexFile': """ Merge the given treeish revisions into a new index which is returned. This method behaves like git-read-tree --aggressive when doing the merge. diff --git a/git/index/util.py b/git/index/util.py index ccdc5c1c..471e9262 100644 --- a/git/index/util.py +++ b/git/index/util.py @@ -11,13 +11,10 @@ import os.path as osp # typing ---------------------------------------------------------------------- -from typing import (Any, Callable, List, Sequence, TYPE_CHECKING, Tuple, cast) +from typing import (Any, Callable) from git.types import PathLike -if TYPE_CHECKING: - from git.repo import Repo - # --------------------------------------------------------------------------------- |