Fix hunk apply failure caused by trailing whitespace mismatch#10
Open
Fix hunk apply failure caused by trailing whitespace mismatch#10
Conversation
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.
Summary
Fixes
PatchApplyExceptionwhen applying multi-hunk patches where the source file has trailing whitespace on context lines that the patch does not (or vice versa).Before: Context lines in
canApplyAt()were compared using strictByteBuffer.equals():This required an exact byte-for-byte match, so
"Line 118 "(with trailing spaces) in the file would not match"Line 118"in the patch context, causing the hunk to be rejected with:After: Context lines are compared using
equalsIgnoringTrailingWhitespace():This strips trailing spaces, tabs, and
\rfrom both the file line and the hunk context line before comparing. Since context lines are only used for positioning the hunk (they're not modified), requiring an exact trailing-whitespace match is unnecessarily strict and causes valid patches to be rejected.Additionally fixes
FileHeader.parseName()to strip trailing\rfrom parsed file paths when patches have CRLF line endings.