diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2016-10-22 11:11:25 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2016-10-22 11:11:25 +0200 |
| commit | caa0ea7a0893fe90ea043843d4e6ad407126d7b8 (patch) | |
| tree | 2f688eb182f2e76091134c47c4a327681c12e15b /git/objects/tree.py | |
| parent | afcd64ebbb770908bd2a751279ff070dea5bb97c (diff) | |
| parent | cc77e6b2862733a211c55cf29cc7a83c36c27919 (diff) | |
| download | gitpython-caa0ea7a0893fe90ea043843d4e6ad407126d7b8.tar.gz | |
Merge branch 'cygwin' of https://github.com/ankostis/GitPython into ankostis-cygwin
Diffstat (limited to 'git/objects/tree.py')
| -rw-r--r-- | git/objects/tree.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git/objects/tree.py b/git/objects/tree.py index 18c0add1..ed7c2435 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 join_path import git.diff as diff -from gitdb.util import to_bin_sha +from git.util import to_bin_sha from . import util from .base import IndexObject @@ -18,7 +18,7 @@ from .fun import ( tree_to_stream ) -from gitdb.utils.compat import PY3 +from git.compat import PY3 if PY3: cmp = lambda a, b: (a > b) - (a < b) |