Commit01f0988

authored and

committed

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 semicolons

1 parentda7b5b2 commit01f0988Copy full SHA for 01f0988

File tree

-3

lines changed

-3

lines 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`		`-forlineinlines.split(':')[1:]:`
`513`		`-meta,_,path=line.partition('\x00')`
`514`		`-path=path.rstrip('\x00')`
	`512`	`+it=iter(lines.split('\x00'))`
	`513`	`+formeta,pathinzip(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)`

Comments

(0)