Repository navigation
style: restore upstream trailing whitespace - #51
Merged
Merged
Conversation
Earlier upstream merges stripped trailing whitespace from upstream lines in configure.ac, NEWS, the syswrap and debuginfo sources, and the untouched parts of the callgrind files we modify. Every upstream edit next to one of those lines then conflicts on the following merge. Take upstream's bytes back for every line that only differed by trailing whitespace. Refs COD-3818 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Merging this PR will not alter performance
Comparing Footnotes
|
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.
Restore upstream's trailing whitespace on the 496 lines (10 files) where it was the only difference from upstream
VALGRIND_3_26_0.Earlier upstream merges (3.24.0 and 3.26.0) stripped it from upstream lines in
configure.ac,NEWS, the syswrap and debuginfo sources, and the untouched parts of the callgrind files we modify. Any upstream edit next to one of those lines then conflicts at the next merge: in a trial merge of 3.27.1, 6 of the 7 conflict hunks were only this.The change is whitespace-only:
git diff --ignore-space-at-eolover the commit is empty, and every touched file now differs fromVALGRIND_3_26_0only by our real changes.PS: yes this is so cursed 🤣
Refs COD-3818