summaryrefslogtreecommitdiff
path: root/lib/git/diff.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2009-11-03 16:35:33 +0100
committerSebastian Thiel <byronimo@gmail.com>2009-11-03 16:35:33 +0100
commit3cb5ba18ab1a875ef6b62c65342de476be47871b (patch)
treed287a2fad9f87856b6937ffd4abaed66c9066da7 /lib/git/diff.py
parentdbc18b92362f60afc05d4ddadd6e73902ae27ec7 (diff)
downloadgitpython-3cb5ba18ab1a875ef6b62c65342de476be47871b.tar.gz
object: renamed id attribute to sha as it in fact is always being rewritten as sha, even if the passed in id was a ref. This is done to assure objects are uniquely identified and will compare correctly
Diffstat (limited to 'lib/git/diff.py')
-rw-r--r--lib/git/diff.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/git/diff.py b/lib/git/diff.py
index b0e0898a..9a826630 100644
--- a/lib/git/diff.py
+++ b/lib/git/diff.py
@@ -186,11 +186,11 @@ class Diff(object):
if not a_blob_id or self.re_is_null_hexsha.search(a_blob_id):
self.a_blob = None
else:
- self.a_blob = blob.Blob(repo, id=a_blob_id, mode=a_mode, path=a_path)
+ self.a_blob = blob.Blob(repo, a_blob_id, mode=a_mode, path=a_path)
if not b_blob_id or self.re_is_null_hexsha.search(b_blob_id):
self.b_blob = None
else:
- self.b_blob = blob.Blob(repo, id=b_blob_id, mode=b_mode, path=b_path)
+ self.b_blob = blob.Blob(repo, b_blob_id, mode=b_mode, path=b_path)
self.a_mode = a_mode
self.b_mode = b_mode