From d17136574ef23050fe3271e51a8b811f96544b17 Mon Sep 17 00:00:00 2001 From: Austin Scola Date: Tue, 21 Jun 2022 09:19:54 -0400 Subject: Move stage type def --- git/index/base.py | 2 +- git/index/typ.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'git') diff --git a/git/index/base.py b/git/index/base.py index fb2088a7..10f8b8b2 100644 --- a/git/index/base.py +++ b/git/index/base.py @@ -52,6 +52,7 @@ from .fun import ( from .typ import ( BaseIndexEntry, IndexEntry, + StageType, ) from .util import TemporaryFileSwap, post_clear_cache, default_index, git_working_dir @@ -83,7 +84,6 @@ if TYPE_CHECKING: from git.util import Actor -StageType = int Treeish = Union[Tree, Commit, str, bytes] # ------------------------------------------------------------------------------------ diff --git a/git/index/typ.py b/git/index/typ.py index d9040e10..5264f370 100644 --- a/git/index/typ.py +++ b/git/index/typ.py @@ -4,7 +4,6 @@ from binascii import b2a_hex from .util import pack, unpack from git.objects import Blob -from git.index.base import StageType # typing ---------------------------------------------------------------------- @@ -16,9 +15,11 @@ from git.types import PathLike if TYPE_CHECKING: from git.repo import Repo +StageType = int + # --------------------------------------------------------------------------------- -__all__ = ("BlobFilter", "BaseIndexEntry", "IndexEntry") +__all__ = ("BlobFilter", "BaseIndexEntry", "IndexEntry", "StageType") # { Invariants CE_NAMEMASK = 0x0FFF -- cgit v1.2.1