Skip to content

Implement an advanced fuzzy diffing feature for interdiff #156

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

Open
kerneltoast wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Implement an advanced fuzzy diffing feature for interdiff #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ce948ad
Make patch arguments more extensible in apply_patch()
kerneltoast Oct 17, 2025
dcd431d
Simplify original file creation in output_delta()
kerneltoast Oct 31, 2025
430bbfc
Exclude newline character from colorized output
kerneltoast Nov 14, 2025
07ecce5
Fix content skipping for patch2 in index_patch_generic()
kerneltoast Nov 14, 2025
69d0479
Implement an advanced fuzzy diffing feature for interdiff
kerneltoast Feb 19, 2026
3aa81a3
interdiff: Fix incorrect base file direction in fuzzy mode
kerneltoast Dec 2, 2025
5a167c3
interdiff: Fix bogus hunk removal in split_patch_hunks()
kerneltoast Dec 2, 2025
c3bbb8a
interdiff: Use -N on patch all the time
kerneltoast Jan 24, 2026
e260bd2
interdiff: Begin fixing the direction of delta differences in fuzzy mode
kerneltoast Dec 23, 2025
3edaecc
interdiff: Fix hunk lookup to use actual applied position, not adjust…
kerneltoast Jan 16, 2026
f5ea809
interdiff: Stop modifying file strings in-place
kerneltoast Jan 24, 2026
faece22
interdiff: Add run_diff() helper function
kerneltoast Feb 4, 2026
089f677
interdiff: Separate delta and context differences in fuzzy mode
kerneltoast Feb 19, 2026
2b32e73
interdiff: Show files only in one patch under fuzzy mode headers
kerneltoast Feb 19, 2026
2776b58
interdiff: Filter spurious edge lines from context differences
kerneltoast Feb 19, 2026
0c46ac1
interdiff: Add skip_header_lines() helper function
kerneltoast Feb 19, 2026
49b397b
interdiff: Add get_fuzz() helper function
kerneltoast Feb 19, 2026
0786015
interdiff: Fix crash in ctx_lookahead() on trailing + lines
kerneltoast Feb 19, 2026
7fbd440
interdiff: Fix split hunk context imbalance causing patch rejections
kerneltoast Feb 19, 2026
84a6fe1
tests: Add fuzzy mode tests for interdiff
kerneltoast Feb 20, 2026
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
11 changes: 10 additions & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,16 @@ TESTS = tests/newline1/run-test \
tests/git-deleted-file/run-test \
tests/git-pure-rename/run-test \
tests/git-diff-edge-cases/run-test \
tests/malformed-diff-headers/run-test
tests/malformed-diff-headers/run-test \
tests/fuzzy1/run-test \
tests/fuzzy2/run-test \
tests/fuzzy3/run-test \
tests/fuzzy4/run-test \
tests/fuzzy5/run-test \
tests/fuzzy6/run-test \
tests/fuzzy7/run-test \
tests/fuzzy8/run-test \
tests/fuzzy9/run-test

# Scanner tests (only when scanner-patchfilter is enabled)
if USE_SCANNER_PATCHFILTER
Expand Down
Loading