Skip to content

Ignore empty info in diff line #1497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 27, 2022
Merged

Ignore empty info in diff line #1497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Ignore empty info in diff line
  • Loading branch information
@dwapstra
dwapstra committed Sep 27, 2022
commit 41003c548f9df2dc389f14be58b5a41d35d0e73d
3 changes: 3 additions & 0 deletions git/diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,9 @@ def _handle_diff_line(lines_bytes: bytes, repo: "Repo", index: DiffIndex) -> Non
_, _, lines = lines.partition(":")

for line in lines.split("\x00:"):
if not line:
# The line data is empty, skip
continue
meta, _, path = line.partition("\x00")
path = path.rstrip("\x00")
a_blob_id: Optional[str]
Expand Down
6 changes: 6 additions & 0 deletions test/test_diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,12 @@ def test_diff_file_with_colon(self):
output = fixture("diff_file_with_colon")
res = []
Diff._handle_diff_line(output, None, res)
self.assertEqual(len(res), 3)

def test_empty_diff(self):
res = []
Diff._handle_diff_line(b"", None, res)
self.assertEqual(res, [])

def test_diff_initial_commit(self):
initial_commit = self.rorepo.commit("33ebe7acec14b25c5f84f35a664803fcab2f7781")
Expand Down