diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-06-28 19:16:23 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-06-28 19:16:23 +0200 |
| commit | 8d2239f24f6a54d98201413d4f46256df0d6a5f3 (patch) | |
| tree | cd3685e0bd87441eab4888efbc4e14a232a65a7b /test/git/test_index.py | |
| parent | 58fb1187b7b8f1e62d3930bdba9be5aba47a52c6 (diff) | |
| parent | 1fe889ea0cb2547584075dc1eb77f52c54b9a8c4 (diff) | |
| download | gitpython-8d2239f24f6a54d98201413d4f46256df0d6a5f3.tar.gz | |
Merge branch 'sha20'
Diffstat (limited to 'test/git/test_index.py')
| -rw-r--r-- | test/git/test_index.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/git/test_index.py b/test/git/test_index.py index e9f99f04..705d8029 100644 --- a/test/git/test_index.py +++ b/test/git/test_index.py @@ -354,7 +354,7 @@ class TestIndex(TestBase): if type_id == 0: # path yield entry.path elif type_id == 1: # blob - yield Blob(rw_repo, entry.hexsha, entry.mode, entry.path) + yield Blob(rw_repo, entry.binsha, entry.mode, entry.path) elif type_id == 2: # BaseIndexEntry yield BaseIndexEntry(entry[:4]) elif type_id == 3: # IndexEntry @@ -449,7 +449,7 @@ class TestIndex(TestBase): old_blob = new_commit.parents[0].tree.blobs[0] entries = index.reset(new_commit).add([old_blob], fprogress=self._fprogress_add) self._assert_fprogress(entries) - assert index.entries[(old_blob.path,0)].hexsha == old_blob.sha and len(entries) == 1 + assert index.entries[(old_blob.path,0)].hexsha == old_blob.hexsha and len(entries) == 1 # mode 0 not allowed null_hex_sha = Diff.NULL_HEX_SHA @@ -567,7 +567,7 @@ class TestIndex(TestBase): for fid in range(3): fname = 'newfile%i' % fid open(fname, 'wb').write("abcd") - yield Blob(rw_repo, Blob.NULL_HEX_SHA, 0100644, fname) + yield Blob(rw_repo, Blob.NULL_BIN_SHA, 0100644, fname) # END for each new file # END path producer paths = list(make_paths()) |