summaryrefslogtreecommitdiff
path: root/git/objects
diff options
context:
space:
mode:
Diffstat (limited to 'git/objects')
-rw-r--r--git/objects/blob.py2
-rw-r--r--git/objects/commit.py6
-rw-r--r--git/objects/submodule/base.py2
-rw-r--r--git/objects/tag.py4
-rw-r--r--git/objects/tree.py4
5 files changed, 9 insertions, 9 deletions
diff --git a/git/objects/blob.py b/git/objects/blob.py
index 326c5459..9c51f99f 100644
--- a/git/objects/blob.py
+++ b/git/objects/blob.py
@@ -6,7 +6,7 @@
from git.util import RepoAliasMixin
from mimetypes import guess_type
-from gitdb.typ import ObjectType
+from git.typ import ObjectType
import base
diff --git a/git/objects/commit.py b/git/objects/commit.py
index 30dcaa0a..4ca5877e 100644
--- a/git/objects/commit.py
+++ b/git/objects/commit.py
@@ -5,11 +5,11 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
import base
-from gitdb.typ import ObjectType
+from git.typ import ObjectType
from tree import Tree
from cStringIO import StringIO
-from gitdb.util import (
+from git.util import (
hex_to_bin,
Actor,
RepoAliasMixin,
@@ -24,7 +24,7 @@ from util import (
parse_actor_and_date
)
from git.diff import Diffable
-from gitdb.base import IStream
+from git.base import IStream
from cStringIO import StringIO
from util import parse_date
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
index 9b45d9b6..f6cf278a 100644
--- a/git/objects/submodule/base.py
+++ b/git/objects/submodule/base.py
@@ -1,5 +1,5 @@
from git.util import RepoAliasMixin
-from gitdb.object.submodule import Submodule as GitDB_Submodule
+from git.object.submodule import Submodule as GitDB_Submodule
import util
from util import (
mkhead,
diff --git a/git/objects/tag.py b/git/objects/tag.py
index 0bd1d20c..5dcd9bf9 100644
--- a/git/objects/tag.py
+++ b/git/objects/tag.py
@@ -6,12 +6,12 @@
""" Module containing all object based types. """
import base
from git.util import RepoAliasMixin
-from gitdb.util import hex_to_bin
+from git.util import hex_to_bin
from util import (
get_object_type_by_name,
parse_actor_and_date
)
-from gitdb.typ import ObjectType
+from git.typ import ObjectType
__all__ = ("TagObject", )
diff --git a/git/objects/tree.py b/git/objects/tree.py
index 1b5f7561..689aeaf6 100644
--- a/git/objects/tree.py
+++ b/git/objects/tree.py
@@ -5,7 +5,7 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
from git.util import RepoAliasMixin
import git.diff as diff
-from gitdb.typ import ObjectType
+from git.typ import ObjectType
from base import IndexObject
from blob import Blob
from submodule import Submodule
@@ -15,7 +15,7 @@ from fun import (
tree_to_stream
)
-from gitdb.util import (
+from git.util import (
to_bin_sha,
join_path
)