Skip to content

Commit 7cf2d5f

Browse files
committed
Merge branch 'refactor' into submodule
2 parents ebe8f64 + 9519f18 commit 7cf2d5f

File tree

7 files changed

+409
-354
lines changed

7 files changed

+409
-354
lines changed

lib/git/objects/__init__.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,18 @@
33
"""
44
import inspect
55
from base import *
6+
# Fix import dependency - add IndexObject to the util module, so that it can be
7+
# imported by the submodule.base
8+
import submodule.util
9+
submodule.util.IndexObject = IndexObject
10+
from submodule.base import *
11+
from submodule.root import *
12+
13+
# must come after submodule was made available
614
from tag import *
715
from blob import *
8-
from tree import *
916
from commit import *
10-
from submodule import *
17+
from tree import *
1118
from util import Actor
1219

1320
__all__ = [ name for name, obj in locals().items()

lib/git/objects/submodule/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

0 commit comments

Comments
 (0)