Backport trailing whitespace removal #1609
Merged
Conversation
This file contains 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
|
THanks! |
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.
As I understand it, the
masterbranch may not be released as 2.9 or 3.0 any time soon. As such, any code that should be released soon will need to be backported to2-8-stable.This PR simply cherry-picks 956a73e (#1510/#1441), for the sole purpose of reducing diff noise between the
masterand2-8-stablebranches. While it is possible to use the-wflag to various git commands for my own investigations from my own terminal window, that option isn't always possible for various other tools (including the github web UI).My hope is that, with that diff noise reduced, it may be a little bit easier to backport other PRs. It was certainly useful for me when I was doing my own comparison between the branches.
There were only a couple of very minor conflicts that were resolved by simply using the
2-8-stableversion and removing its trailing whitespace directly. Reading through the commit, I believe this is safe.git show -w $PR_COMMITshould be empty for this PR.