diff options
Diffstat (limited to 'lib/git/index')
| -rw-r--r-- | lib/git/index/base.py | 6 | ||||
| -rw-r--r-- | lib/git/index/fun.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/git/index/base.py b/lib/git/index/base.py index 1a8bee93..4b3197a2 100644 --- a/lib/git/index/base.py +++ b/lib/git/index/base.py @@ -36,7 +36,7 @@ from util import ( import git.objects import git.diff as diff -from git.errors import ( +from git.exc import ( GitCommandError, CheckoutError ) @@ -48,9 +48,9 @@ from git.objects import ( Commit, ) -from git.objects.utils import Serializable +from git.objects.util import Serializable -from git.utils import ( +from git.util import ( IndexFileSHA1Writer, LazyMixin, LockedFD, diff --git a/lib/git/index/fun.py b/lib/git/index/fun.py index cc18c65c..fac559c5 100644 --- a/lib/git/index/fun.py +++ b/lib/git/index/fun.py @@ -5,8 +5,8 @@ more versatile from stat import S_IFDIR from cStringIO import StringIO -from git.utils import IndexFileSHA1Writer -from git.errors import UnmergedEntriesError +from git.util import IndexFileSHA1Writer +from git.exc import UnmergedEntriesError from git.objects.fun import ( tree_to_stream, traverse_tree_recursive, |