Commit25f27c8

committed

Split diff line by '\t' for metadata and path

This protects against `.split(None)` which uses consecutive whitespaceas a separator to overlook paths where a single space is the filename.For example, in this diff line:line = ':100644 000000e69de290000000000000000000000000000000000000000 D 'The deleted file is a file named ' ' (just one space). It's entirelypossible to commit this, remove, and to produce the following outputfrom `git diff`:git diff --name-status <SHA1> <SHA2>DM path/to/another/file.py...This would cause the initial `.split(None, 5)` to fail as it will countall consecutive whitespace as a separator, disregarding the ' ' (singlespace) filename.

1 parentb297148 commit25f27c8Copy full SHA for 25f27c8

File tree

1 file changed

-1

lines changed

git
- diff.py

1 file changed

-1

lines changed

`‎git/diff.py`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,8 @@ def _index_from_raw_format(cls, repo, stream):`
`365`	`365`	`ifnotline.startswith(":"):`
`366`	`366`	`continue`
`367`	`367`	`# END its not a valid diff line`
`368`		`-old_mode,new_mode,a_blob_id,b_blob_id,change_type,path=line[1:].split(None,5)`
	`368`	`+meta,_,path=line[1:].partition('\t')`
	`369`	`+old_mode,new_mode,a_blob_id,b_blob_id,change_type=meta.split(None,4)`
`369`	`370`	`path=path.strip()`
`370`	`371`	`a_path=path`
`371`	`372`	`b_path=path`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit25f27c8

File tree

1 file changed

1 file changed

`‎git/diff.py`

0 commit comments