Repository navigation
fix: keep CRLF line endings when staging or discarding lines - #3053
Open
jayhemnani9910 wants to merge 1 commit into
Open
jayhemnani9910 wants to merge 1 commit into
jayhemnani9910 wants to merge 1 commit into
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.
This Pull Request fixes line staging and line discard in files with CRLF line endings.
In a file stored with CRLF (no autocrlf), staging or discarding a single line rewrites every other line to LF:
The next commit then changes the line endings of the whole file, and a discard leaves the working file changed everywhere.
It changes the following:
stage_linesanddiscard_linessplit the old content withsplit_terminator('\n')instead oflines(), which also strips\r. Hunk lines already keep their\r, so the rebuilt content keeps the file's own endings.I followed the checklist:
test_stage_keeps_crlf,test_discard_keeps_crlf; both fail without the change)make checkwithout errors (ran its fmt, clippy and test steps, not sort/deny;test_pre_commit_pyfails here with or without the change because there is nopythonbinary)