Made most primal imports work, but stopped here as there are many more changes when doing the merge

3 files changed, 6 insertions, 2 deletions

diff --git a/git/objects/fun.py b/git/objects/fun.py
index 22016b27..2443bad7 100644
--- a/git/objects/fun.py
+++ b/git/objects/fun.py
@@ -1,2 +1,4 @@
 """Module with functions which are supposed to be as fast as possible"""
 
+from gitdb.object.fun import *
+
diff --git a/git/objects/tag.py b/git/objects/tag.py
index a3a85eef..59b2362e 100644
--- a/git/objects/tag.py
+++ b/git/objects/tag.py
@@ -5,7 +5,7 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 """ Module containing all object based types. """
 from git.util import RepoAliasMixin
-from gitdb.object.tag import GitDB_TagObject
+from gitdb.object.tag import TagObject as GitDB_TagObject
 __all__ = ("TagObject", )
 
 class TagObject(GitDB_TagObject, RepoAliasMixin):
diff --git a/git/objects/tree.py b/git/objects/tree.py
index 23e1dfe4..00ef07fc 100644
--- a/git/objects/tree.py
+++ b/git/objects/tree.py
@@ -4,9 +4,11 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 from git.util import RepoAliasMixin
-from gitdb.object.tree import GitDB_Tree, TreeModifier
+from gitdb.object.tree import Tree as GitDB_Tree
+from gitdb.object.tree import TreeModifier
 import git.diff as diff
 
+from blob import Blob
 from submodule.base import Submodule
 
 __all__ = ("TreeModifier", "Tree")