Skip to content

make diff of blob to blob in repository.diff work #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdavid merged 2 commits into from
Apr 3, 2015
Merged

make diff of blob to blob in repository.diff work #508

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99e1cad
bug fix in repository.diff
spderosso Mar 31, 2015
08f2956
diff of blob to blob in repository.diff
spderosso Mar 31, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions pygit2/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,14 +381,12 @@ def whatever_to_tree_or_blob(obj):
try:
obj = obj.peel(Blob)
except Exception:
pass

# And if that failed, try to get a tree, raising a type
# error if that still doesn't work
try:
obj = obj.peel(Tree)
except Exception:
raise TypeError('unexpected "%s"' % type(obj))
# And if that failed, try to get a tree, raising a type
# error if that still doesn't work
try:
obj = obj.peel(Tree)
except Exception:
raise TypeError('unexpected "%s"' % type(obj))

return obj

Expand All @@ -415,7 +413,7 @@ def whatever_to_tree_or_blob(obj):

# Case 4: Diff blob to blob
if isinstance(a, Blob) and isinstance(b, Blob):
raise NotImplementedError('git_diff_blob_to_blob()')
return a.diff(b)

raise ValueError("Only blobs and treeish can be diffed")

Expand Down