Skip to content

Git binary diff handling fix #118

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
twaugh merged 2 commits into from
Sep 12, 2025
Merged

Git binary diff handling fix #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5e408d
Fix incorrect expectation in git-error-handling test
twaugh Sep 12, 2025
1a00f4b
Small fix for git binary diff handling
twaugh Sep 12, 2025
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
3 changes: 3 additions & 0 deletions src/filterdiff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,6 +1227,9 @@ static int filterdiff (FILE *f, const char *patchname)
else if (!strncmp (line, "Binary files ", 13)) {
/* Binary files line - this is diff content, break to process */
break;
} else if (!strncmp (line, "GIT binary patch", 16)) {
/* GIT binary patch line - this is diff content, break to process */
break;
} else if (strncmp (line, "old mode ", 9) &&
strncmp (line, "new mode ", 9) &&
strncmp (line, "deleted file mode ", 18) &&
Expand Down
1 change: 1 addition & 0 deletions tests/git-error-handling/run-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ ${LSDIFF} mixed-binary.patch 2>errors9 >result9 || exit 1

cat << EOF | cmp - result9 || exit 1
a/file1.bin
a/file2.dat
EOF

# Test 10: Empty git diff (just headers, no content)
Expand Down