summaryrefslogtreecommitdiff
path: root/lib/git/objects/__init__.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-11-18 23:11:32 +0100
committerSebastian Thiel <byronimo@gmail.com>2010-11-18 23:11:32 +0100
commitf1545bd9cd6953c5b39c488bf7fe179676060499 (patch)
tree8bd4b8829768fe0195d41a3aa067aa1ac7435605 /lib/git/objects/__init__.py
parenta1d1d2cb421f16bd277d7c4ce88398ff0f5afb29 (diff)
parent7cf2d5fcf0a3db793678dd6ba9fc1c24d4eeb36a (diff)
downloadgitpython-f1545bd9cd6953c5b39c488bf7fe179676060499.tar.gz
Merge branch 'submodule'
Diffstat (limited to 'lib/git/objects/__init__.py')
-rw-r--r--lib/git/objects/__init__.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/git/objects/__init__.py b/lib/git/objects/__init__.py
index 85c7e38c..e8e0ef39 100644
--- a/lib/git/objects/__init__.py
+++ b/lib/git/objects/__init__.py
@@ -3,11 +3,18 @@ Import all submodules main classes into the package space
"""
import inspect
from base import *
+# Fix import dependency - add IndexObject to the util module, so that it can be
+# imported by the submodule.base
+import submodule.util
+submodule.util.IndexObject = IndexObject
+from submodule.base import *
+from submodule.root import *
+
+# must come after submodule was made available
from tag import *
from blob import *
-from tree import *
from commit import *
-from submodule import *
+from tree import *
from util import Actor
__all__ = [ name for name, obj in locals().items()