Commitb27c41a

authored

Merge pull request#1491 from langfield/main

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

2 parentsbec6157 +db392ae commitb27c41aCopy full SHA for b27c41a

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,10 @@ def _index_from_patch_format(cls, repo: "Repo", proc: Union["Popen", "Git.AutoIn`
`570`	`570`	`def_handle_diff_line(lines_bytes:bytes,repo:"Repo",index:DiffIndex)->None:`
`571`	`571`	`lines=lines_bytes.decode(defenc)`
`572`	`572`
`573`		`-forlineinlines.split(":")[1:]:`
	`573`	`+# Discard everything before the first colon, and the colon itself.`
	`574`	`+_,_,lines=lines.partition(":")`
	`575`	`+`
	`576`	`+forlineinlines.split("\x00:"):`
`574`	`577`	`meta,_,path=line.partition("\x00")`
`575`	`578`	`path=path.rstrip("\x00")`
`576`	`579`	`a_blob_id:Optional[str]`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,6 @@ def test_diff_index_raw_format(self):`
`236`	`236`	`res[0].b_path,`
`237`	`237`	`)`
`238`	`238`
`239`		`-@unittest.skip("This currently fails and would need someone to improve diff parsing")`
`240`	`239`	`deftest_diff_file_with_colon(self):`
`241`	`240`	`output=fixture("diff_file_with_colon")`
`242`	`241`	`res= []`

Comments

(0)