summaryrefslogtreecommitdiff
path: root/lib/git/objects/tree.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2009-10-18 12:54:16 +0200
committerSebastian Thiel <byronimo@gmail.com>2009-10-18 12:54:16 +0200
commitaed099a73025422f0550f5dd5c3e4651049494b2 (patch)
tree89499373213a626e597d1c0c8596b6b37a17e82a /lib/git/objects/tree.py
parent17852bde65c12c80170d4c67b3136d8e958a92a9 (diff)
downloadgitpython-aed099a73025422f0550f5dd5c3e4651049494b2.tar.gz
resolved cyclic inclusion issue by moving the Diffable interface into the diff module, which probably is the right thing to do anyway
Diffstat (limited to 'lib/git/objects/tree.py')
-rw-r--r--lib/git/objects/tree.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/git/objects/tree.py b/lib/git/objects/tree.py
index 4d3e9ebd..c35c075e 100644
--- a/lib/git/objects/tree.py
+++ b/lib/git/objects/tree.py
@@ -8,6 +8,7 @@ import os
import blob
import base
import binascii
+import git.diff as diff
def sha_to_hex(sha):
"""Takes a string and returns the hex of the sha within"""
@@ -15,7 +16,7 @@ def sha_to_hex(sha):
assert len(hexsha) == 40, "Incorrect length of sha1 string: %d" % hexsha
return hexsha
-class Tree(base.IndexObject, base.Diffable):
+class Tree(base.IndexObject, diff.Diffable):
"""
Tress represent a ordered list of Blobs and other Trees. Hence it can be
accessed like a list.