Merge pull request #1491 from langfield/main

Fix bug where colons in paths raise a `ValueError` on `diff()` calls.

Author: Byron

git/diff.py

@@ -570,7 +570,10 @@ def _index_from_patch_format(cls, repo: "Repo", proc: Union["Popen", "Git.AutoIn
     def _handle_diff_line(lines_bytes: bytes, repo: "Repo", index: DiffIndex) -> None:
         lines = lines_bytes.decode(defenc)
 
-        for line in lines.split(":")[1:]:
+        # Discard everything before the first colon, and the colon itself.
+        _, _, lines = lines.partition(":")
+
+        for line in lines.split("\x00:"):
             meta, _, path = line.partition("\x00")
             path = path.rstrip("\x00")
             a_blob_id: Optional[str]

test/test_diff.py

@@ -236,7 +236,6 @@ def test_diff_index_raw_format(self):
             res[0].b_path,
         )
 
-    @unittest.skip("This currently fails and would need someone to improve diff parsing")
     def test_diff_file_with_colon(self):
         output = fixture("diff_file_with_colon")
         res = []