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 18 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
18 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
29ff825
Fix content skipping for patch2 in index_patch_generic()
kerneltoast Nov 14, 2025
365f24f
Implement an advanced fuzzy diffing feature for interdiff
kerneltoast Nov 20, 2025
0da6661
Add tests for interdiff fuzzy diffing
kerneltoast Nov 20, 2025
d84f55d
interdiff: Fix incorrect base file direction in fuzzy mode
kerneltoast Dec 2, 2025
a034d6a
interdiff: Fix bogus hunk removal in split_patch_hunks()
kerneltoast Dec 2, 2025
090cf83
Update interdiff fuzzy mode tests
kerneltoast Dec 2, 2025
8368b2e
interdiff: Use -N on patch all the time
kerneltoast Jan 24, 2026
4cacf07
interdiff: Begin fixing the direction of delta differences in fuzzy mode
kerneltoast Dec 23, 2025
e1966fb
interdiff: Fix hunk lookup to use actual applied position, not adjust…
kerneltoast Jan 16, 2026
72bef60
interdiff: Stop modifying file strings in-place
kerneltoast Jan 24, 2026
6db1f35
interdiff: Add run_diff() helper function
kerneltoast Feb 4, 2026
22c4c0c
interdiff: Separate delta and context differences in fuzzy mode
kerneltoast Feb 10, 2026
d3e9407
interdiff: Show files only in one patch under fuzzy mode headers
kerneltoast Feb 10, 2026
114454a
interdiff: Filter spurious edge lines from context differences
kerneltoast Feb 11, 2026
d90325c
tests: Update fuzzy mode expected output
kerneltoast Feb 11, 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