diff --git a/etc/sublime-text/git-python.sublime-project b/etc/sublime-text/git-python.sublime-project

index 3dab9f6562ecb0408d9ece8dd63cc4461d280113..9c99a2cff7dc918fbbb61cd57d5d98750a1ef6c5 100644

--- a/etc/sublime-text/git-python.sublime-project

+++ b/etc/sublime-text/git-python.sublime-project

@@ -23,7 +23,7 @@

]

},

// GITDB

- ////////

+ // ////////

{

"follow_symlinks": true,

"path": "../../git/ext/gitdb",

@@ -42,8 +42,8 @@

".tox",

]

},

- // // SMMAP

- // ////////

+ // // // SMMAP

+ // // ////////

{

"follow_symlinks": true,

"path": "../../git/ext/gitdb/gitdb/ext/smmap",

diff --git a/git/diff.py b/git/diff.py

index 24e47bad9d79534d3cf474fec4f79e6fef122bb1..c1ad532e0217e293906bcfef43c523d6a8e21568 100644

--- a/git/diff.py

+++ b/git/diff.py

@@ -302,13 +302,21 @@ class Diff(object):

diff_header = cls.re_header.match

for diff in ('\n' + text).split('\ndiff --git')[1:]:

header = diff_header(diff)

- assert header is not None, "Failed to parse diff header from " % diff

+ assert header is not None, "Failed to parse diff header from '%s'" % diff

a_path, b_path, similarity_index, rename_from, rename_to, \

old_mode, new_mode, new_file_mode, deleted_file_mode, \

a_blob_id, b_blob_id, b_mode = header.groups()

new_file, deleted_file = bool(new_file_mode), bool(deleted_file_mode)

+ # if a_path.startswith('a/'):

+ # a_path = a_path[2:]

+ # if b_path.startswith('b/'):

+ # b_path = b_path[2:]

+

+ for item in (a_path, b_path, a_blob_id, b_blob_id, old_mode, deleted_file_mode, new_mode, new_file_mode, b_mode, new_file, deleted_file, rename_from, rename_to, diff[header.end():]):

+ print( "####")

+ print(item)

index.append(Diff(repo, a_path, b_path, a_blob_id, b_blob_id,

old_mode or deleted_file_mode, new_mode or new_file_mode or b_mode,

new_file, deleted_file, rename_from, rename_to, diff[header.end():]))

diff --git a/git/ext/gitdb b/git/ext/gitdb

index f2233fbf40f3f69309ce5cc714e99fcbdcd33ec3..a88a777df3909a61be97f1a7b1194dad6de25702 160000

--- a/git/ext/gitdb

+++ b/git/ext/gitdb

@@ -1 +1 @@

-Subproject commit f2233fbf40f3f69309ce5cc714e99fcbdcd33ec3

+Subproject commit a88a777df3909a61be97f1a7b1194dad6de25702-dirty

diff --git a/test/fixtures/diff_patch_binary b/test/fixtures/diff_patch_binary

new file mode 100644

index 0000000000000000000000000000000000000000..c92ccd6ebc92a871d38ad7cb8a48bcdb1a5dbc33

--- /dev/null

+++ b/test/fixtures/diff_patch_binary

@@ -0,0 +1,3 @@

+diff --git a/rps b/rps

+index f4567df37451b230b1381b1bc9c2bcad76e08a3c..736bd596a36924d30b480942e9475ce0d734fa0d 100755

+Binary files a/rps and b/rps differ

diff --git a/test/fixtures/diff_raw_binary b/test/fixtures/diff_raw_binary

new file mode 100644

index 0000000000000000000000000000000000000000..d4673fa41ee8413384167fc7b9f25e4daf18a53a

--- /dev/null

+++ b/test/fixtures/diff_raw_binary

@@ -0,0 +1 @@

+:100755 100755 f4567df37451b230b1381b1bc9c2bcad76e08a3c 736bd596a36924d30b480942e9475ce0d734fa0d M rps

diff --git a/test/test_diff.py b/test/test_diff.py

index ce0f64f2261bd8de063233108caac1f26742c1fd..4de26f8884fd048ac7f10007f2bf7c7fa3fa60f4 100644

--- a/test/test_diff.py

+++ b/test/test_diff.py

@@ -65,6 +65,21 @@ class TestDiff(TestBase):

assert diff.rename_to == 'that'

assert len(list(diffs.iter_change_type('R'))) == 1

+ def test_binary_diff(self):

+ for method, file_name in ((Diff._index_from_patch_format, 'diff_patch_binary'),

+ (Diff._index_from_raw_format, 'diff_raw_binary')):

+ res = method(None, StringProcessAdapter(fixture(file_name)).stdout)

+ assert len(res) == 1

+ assert len(list(res.iter_change_type('M'))) == 1

+ if res[0].diff:

+ assert res[0].diff == "Binary files a/rps and b/rps differ\n", "in patch mode, we get a diff text"

+ assert isinstance(str(res[0]), str), "This call should just work"

+ # end for each method to test

+

+ def test_diff_index(self):

+ res = self.rorepo.index.diff('17f5d13a7a741dcbb2a30e147bdafe929cff4697', create_patch=True)

+ assert len(res) == 3

+

def test_diff_patch_format(self):

# test all of the 'old' format diffs for completeness - it should at least

# be able to deal with it