diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2010-06-28 19:15:42 +0200 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2010-06-28 19:15:54 +0200 |
commit | 1fe889ea0cb2547584075dc1eb77f52c54b9a8c4 (patch) | |
tree | cd3685e0bd87441eab4888efbc4e14a232a65a7b /lib/git/diff.py | |
parent | 47e3138ee978ce708a41f38a0d874376d7ae5c78 (diff) | |
download | gitpython-1fe889ea0cb2547584075dc1eb77f52c54b9a8c4.tar.gz |
All tests adjusted to work with the changed internal sha representation
Diffstat (limited to 'lib/git/diff.py')
-rw-r--r-- | lib/git/diff.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/git/diff.py b/lib/git/diff.py index 24cba3ed..b8585a4c 100644 --- a/lib/git/diff.py +++ b/lib/git/diff.py @@ -8,6 +8,8 @@ import re from objects.blob import Blob from objects.utils import mode_str_to_int from errors import GitCommandError + +from gitdb.util import hex_to_bin __all__ = ('Diffable', 'DiffIndex', 'Diff') @@ -197,11 +199,11 @@ class Diff(object): if a_blob_id is None: self.a_blob = None else: - self.a_blob = Blob(repo, a_blob_id, mode=a_mode, path=a_path) + self.a_blob = Blob(repo, hex_to_bin(a_blob_id), mode=a_mode, path=a_path) if b_blob_id is None: self.b_blob = None else: - self.b_blob = Blob(repo, b_blob_id, mode=b_mode, path=b_path) + self.b_blob = Blob(repo, hex_to_bin(b_blob_id), mode=b_mode, path=b_path) self.a_mode = a_mode self.b_mode = b_mode |