fix: Always present git inserted as Header #11922
Merged
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
|
This handling should be applied to removed "\ No newline...", too. E.g. 1e1b946 |
Git may insert "\ No newline at end of file" in the end lines of a diff, this was not presented as Header unless last line.
3fab1b8 to
59b130e
Compare
That example was more than the 4 lines I assumed was reasonable, removed that limitation and use any line starting with |
mstv
approved these changes
Sep 16, 2024
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.
Part of #11831, that PR reports on the Git behavior to insert the information rather than the GE presentation.
I do not want to manipulate the git-diff output here, which is what is requested in #11831.
Proposed changes
Git may insert "\ No newline at end of file" in the end lines of a diff, this was not presented as Header unless last line.
(This printout may appear before last line in addition to the last line.)
Incorrect line numbers and not extra gray background.
Note that all printouts with '' as first chars could be handled this way, the first position is special (+/-/@ after the header).
Screenshots
See 1e1b946
Before
After
Test methodology
A test is added in an upcoming PR, some restructuring is done to tests and I prefer to wait on that.
(PR awaits #11851 and #11862).
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.