Fix bug where colons in paths raise a `ValueError` on `diff()` calls. · gitpython-developers/GitPython@db392ae · GitHub

1. gitpython-developers
2. GitPython

Repository navigation

• Code
• Issues6 (6)
• Pull requests1 (1)
• Discussions
• Actions
• Security and quality41 (41)
• Insights

Commit db392ae

Browse filesBrowse the repository at this point in the historyBrowse files

langfield

committed

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

This commit introduces a potential fix for #1490 and #1483, in which an `invalid literal for int() with base 10: 'n'` exception was raised within a diff operation. Within `_handle_diff_line()`, we split the output of `git diff-tree` on colons (`:` characters), under the assumption that there are no colons within the paths of the files being diffed. On POSIX systems this is not a valid assumption. The fix is to split on `\x00:`, since a null character always precedes the colons we actually need to split on. A test already existed for this case (`test_diff_file_with_colon()`), but it was marked as skipped. * Split on `\x00:` instead of `:` in `_handle_diff_line()`. * Unskip `test_diff_file_with_colon()`.

1 parent bec6157 commit db392ae
Copy full SHA for db392ae

2 files changed

+4-2Lines changed: 4 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• git
  • diff.py
• test
  • test_diff.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎git/diff.py‎

Copy file name to clipboardExpand all lines: git/diff.py

+4-1Lines 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		- for line in lines.split(":")[1:]:
	573	+ # Discard everything before the first colon, and the colon itself.
	574	+ _, _, lines = lines.partition(":")
	575	+
	576	+ for line in lines.split("\x00:"):
574	577	meta, _, path = line.partition("\x00")
575	578	path = path.rstrip("\x00")
576	579	a_blob_id: Optional[str]

Collapse file

‎test/test_diff.py‎

Copy file name to clipboardExpand all lines: test/test_diff.py

-1Lines 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	def test_diff_file_with_colon(self):
241	240	output = fixture("diff_file_with_colon")
242	241	res = []

0 commit comments

Comments

0 (0)