summaryrefslogtreecommitdiff
path: root/lib/git/db.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-06-22 12:03:53 +0200
committerSebastian Thiel <byronimo@gmail.com>2010-06-22 12:03:53 +0200
commit778234d544b3f58dd415aaf10679d15b01a5281f (patch)
tree57e86ae1ca34f7e3e658b1f078f705ba1b397c10 /lib/git/db.py
parent91725f0fc59aa05ef68ab96e9b29009ce84668a5 (diff)
parentc4f49fb232acb2c02761a82acc12c4040699685d (diff)
downloadgitpython-778234d544b3f58dd415aaf10679d15b01a5281f.tar.gz
Merge branch 'writetree'
Diffstat (limited to 'lib/git/db.py')
-rw-r--r--lib/git/db.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/git/db.py b/lib/git/db.py
index f3698b76..b7cf0fc7 100644
--- a/lib/git/db.py
+++ b/lib/git/db.py
@@ -4,9 +4,12 @@ from gitdb.base import (
OStream
)
+from gitdb.util import to_hex_sha
+
from gitdb.db import GitDB
from gitdb.db import LooseObjectDB
+
__all__ = ('GitCmdObjectDB', 'GitDB' )
#class GitCmdObjectDB(CompoundDB, ObjectDBW):
@@ -24,11 +27,11 @@ class GitCmdObjectDB(LooseObjectDB):
self._git = git
def info(self, sha):
- t = self._git.get_object_header(sha)
+ t = self._git.get_object_header(to_hex_sha(sha))
return OInfo(*t)
def stream(self, sha):
"""For now, all lookup is done by git itself"""
- t = self._git.stream_object_data(sha)
+ t = self._git.stream_object_data(to_hex_sha(sha))
return OStream(*t)