summaryrefslogtreecommitdiff
path: root/lib/git/db.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-06-28 19:16:23 +0200
committerSebastian Thiel <byronimo@gmail.com>2010-06-28 19:16:23 +0200
commit8d2239f24f6a54d98201413d4f46256df0d6a5f3 (patch)
treecd3685e0bd87441eab4888efbc4e14a232a65a7b /lib/git/db.py
parent58fb1187b7b8f1e62d3930bdba9be5aba47a52c6 (diff)
parent1fe889ea0cb2547584075dc1eb77f52c54b9a8c4 (diff)
downloadgitpython-8d2239f24f6a54d98201413d4f46256df0d6a5f3.tar.gz
Merge branch 'sha20'
Diffstat (limited to 'lib/git/db.py')
-rw-r--r--lib/git/db.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/git/db.py b/lib/git/db.py
index b7cf0fc7..c36446d0 100644
--- a/lib/git/db.py
+++ b/lib/git/db.py
@@ -4,7 +4,7 @@ from gitdb.base import (
OStream
)
-from gitdb.util import to_hex_sha
+from gitdb.util import bin_to_hex
from gitdb.db import GitDB
from gitdb.db import LooseObjectDB
@@ -27,11 +27,11 @@ class GitCmdObjectDB(LooseObjectDB):
self._git = git
def info(self, sha):
- t = self._git.get_object_header(to_hex_sha(sha))
+ t = self._git.get_object_header(bin_to_hex(sha))
return OInfo(*t)
def stream(self, sha):
"""For now, all lookup is done by git itself"""
- t = self._git.stream_object_data(to_hex_sha(sha))
+ t = self._git.stream_object_data(bin_to_hex(sha))
return OStream(*t)