@@ -365,7 +365,8 @@ def _index_from_raw_format(cls, repo, stream):
             if not line.startswith(":"):
                 continue
             # END its not a valid diff line
-            old_mode, new_mode, a_blob_id, b_blob_id, change_type, path = line[1:].split(None, 5)
+            meta, _, path = line[1:].partition('\t')
+            old_mode, new_mode, a_blob_id, b_blob_id, change_type = meta.split(None, 4)
             path = path.strip()
             a_path = path
             b_path = path
 
@@ -0,0 +1 @@
+:100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 D	 
@@ -122,6 +122,12 @@ def test_diff_index(self):
         dr = res[3]
         assert dr.diff.endswith(b"+Binary files a/rps and b/rps differ\n")
 
+    def test_diff_index_raw_format(self):
+        output = StringProcessAdapter(fixture('diff_index_raw'))
+        res = Diff._index_from_raw_format(None, output.stdout)
+        assert res[0].deleted_file
+        assert res[0].b_path == ''
+
     def test_diff_patch_format(self):
         # test all of the 'old' format diffs for completness - it should at least
         # be able to deal with it
Original file line number	Diff line number	Diff line change
@@ -0,0 +1 @@
	1	+ :100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 D