github actions: Update interdiff for bug fixes and post-rework refinement#908
Open
kerneltoast wants to merge 1 commit intomainfrom
Open
github actions: Update interdiff for bug fixes and post-rework refinement#908kerneltoast wants to merge 1 commit intomainfrom
kerneltoast wants to merge 1 commit intomainfrom
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates the pinned commit hash for the interdiff tool (from kerneltoast/patchutils) used in the GitHub Actions workflow to incorporate bug fixes and post-rework refinements. The interdiff tool is used to compare patches between backported commits and their upstream counterparts. The update addresses false rejections where identical changes were incorrectly flagged as needing manual review, and fixes a crash that could occur with certain hunk patterns.
Changes:
- Update the interdiff commit hash from d90325ceaa8835b85db56ded37cf3407377078db to b96146f12e7c39e45c7a2b62b16ab6b69871ed05 to incorporate bug fixes and code improvements
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
…ment Here's a short summary written by Claude of what's changed in interdiff: When comparing two patches that make identical changes, interdiff --fuzzy would sometimes incorrectly report those hunks as rejected. This happened because the internal hunk splitting produced sub-hunks with unbalanced context that the patch utility couldn't locate in the file. The fix ensures split hunks always have balanced context so the patch utility can match them correctly. Also fixed a crash that could occur when a split hunk ends with an addition line. Internal data structures were reworked for correctness and efficiency (length-tracked line buffers instead of nul-terminated strings, O(1) list appends, dead code removal). No user-facing behavior changes beyond the bug fix above.
474842d to
0b46716
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Here's a short summary written by Claude of what's changed in interdiff:
What's changed in interdiff --fuzzy
Bug fix: fewer false rejections when comparing patches
When comparing two patches that make identical changes,
interdiff --fuzzywould sometimes incorrectly report those hunks as "REJECTED PATCH2 HUNKS - could not be compared; manual review needed." This happened because the internal hunk splitting produced sub-hunks with unbalanced context that the patch utility couldn't locate in the file. The fix ensures split hunks always have balanced context so the patch utility can match them correctly.Also fixed a crash that could occur when a split hunk ends with an addition line.
Code cleanup
Internal data structures were reworked for correctness and efficiency (length-tracked line buffers instead of nul-terminated strings, O(1) list appends, dead code removal). No user-facing behavior changes beyond the bug fix above.
This fixes the spurious rejected hunks @PlaidCat observed in #898 (comment), so now the interdiff output for that PR looks like this: