Repository navigation
Commit 01f0988
Use NUL character to extract meta and path from git diff
Use NUL character instead of semicolon to extract meta and path. Avoid errors in during git diff when dealing with filenames containing semicolons1 parent da7b5b2 commit 01f0988
1 file changed
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -509,9 +509,9 @@ def _index_from_patch_format(cls, repo: 'Repo', proc: Union['Popen', 'Git.AutoIn | |||
| 509 | 509 | def _handle_diff_line(lines_bytes: bytes, repo: 'Repo', index: DiffIndex) -> None: | |
| 510 | 510 | lines = lines_bytes.decode(defenc) | |
| 511 | 511 | ||
| 512 | - for line in lines.split(':')[1:]: | ||
| 513 | - meta, _, path = line.partition('\x00') | ||
| 514 | - path = path.rstrip('\x00') | ||
| 512 | + it = iter(lines.split('\x00')) | ||
| 513 | + for meta, path in zip(it, it): | ||
| 514 | + meta = meta[1:] | ||
| 515 | 515 | a_blob_id: Optional[str] | |
| 516 | 516 | b_blob_id: Optional[str] | |
| 517 | 517 | old_mode, new_mode, a_blob_id, b_blob_id, _change_type = meta.split(None, 4) | |
0 commit comments