Patch: Stop mangling file when both pre- and post-patch file has no trailing newline#7128
Open
Patch: Stop mangling file when both pre- and post-patch file has no trailing newline#7128
Conversation
The patch format used by plugin-patch assumes the source file ends with a newline, and uses the "\ No newline at end of file" marker to reconstruct the correct post-patch file contents. This wasn't taken into account when applying the patch, which caused files without a trailing newline to lose their last line after the patch was applied. This change ensures source files are always treated as if they ended with a newline so that the patch can correctly reconstruct the post-patch file contents.
clemyan
changed the title
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
1 participant
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.
What's the problem this PR addresses?
The patch format used by
plugin-patchassumes the source file ends with a newline, and uses the "\ No newline at end of file" marker to reconstruct the correct post-patch file contents. This wasn't taken into account when applying the patch, which caused files without a trailing newline to lose their last line after the patch was applied.Closes #6612
How did you fix it?
Ensures source files are always treated as if they ended with a newline so that the patch can correctly reconstruct the post-patch file contents.
Also found a bug with
fslib's implementation ofDirentwhile writing the tests so I just fixed it in passing.Checklist