fix(staging): preserve no-trailing-newline when staging partial hunks#2979
Closed
Noethix55555 wants to merge 1 commit into
Closed
fix(staging): preserve no-trailing-newline when staging partial hunks#2979Noethix55555 wants to merge 1 commit into
Noethix55555 wants to merge 1 commit into
Conversation
Track whether the output file should end with a newline via a trailing_newline field on NewFromOldContent (default true). When DeleteEOFNL/AddEOFNL markers are encountered in apply_selection, set the flag according to whether the removal or addition is being applied, instead of unconditionally breaking and letting finish() always append \n. Add a regression test that stages a single changed line in a file with no trailing newline and asserts the staged blob is also newline-free.
Author
|
Subsumed by #2977, which already includes this fix. |
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.
Summary
finish()inNewFromOldContentunconditionally appended\nto the reconstructed file content, even when the original file had no trailing newline. TheDeleteEOFNL/AddEOFNLdiff markers were silently discarded with a barebreak, so staging or discarding a single line in a no-newline file would silently corrupt it by adding a newline.trailing_newline: boolfield toNewFromOldContent(defaulttrue).apply_selection, whenDeleteEOFNLorAddEOFNLis encountered, settrailing_newlinebased on whether the change is being applied or reverted, thenbreak.finish(), only append\nwhenself.trailing_newlineis true.test_stage_preserves_no_trailing_newlineinstage_tracked.rsthat stages a single changed line in a two-line file with no trailing newline and asserts the staged blob content is also newline-free.