From 99e1cad3932d63da37bf8b70e8b7bb1c066c8ede Mon Sep 17 00:00:00 2001 From: Santiago Perez De Rosso Date: Tue, 31 Mar 2015 13:49:39 -0400 Subject: [PATCH 1/2] bug fix in repository.diff --- pygit2/repository.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pygit2/repository.py b/pygit2/repository.py index c7330e187..9225daeb3 100644 --- a/pygit2/repository.py +++ b/pygit2/repository.py @@ -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 From 08f2956e9771180f70e5a2707ed3e1fd43f26aff Mon Sep 17 00:00:00 2001 From: Santiago Perez De Rosso Date: Tue, 31 Mar 2015 19:30:15 -0400 Subject: [PATCH 2/2] diff of blob to blob in repository.diff --- pygit2/repository.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pygit2/repository.py b/pygit2/repository.py index 9225daeb3..a9ca2b7bd 100644 --- a/pygit2/repository.py +++ b/pygit2/repository.py @@ -413,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")