Spring upstream formatting p2 #480
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
\n is standard, \r\n is convertible, \r on its own is just plain weird.
CRLF strikes at automated tooling again! Fixing CRLF in the index doesn't necessarily fix them in the working tree. I deleted all files in the repository, then checked out fresh copies to make sure my local working tree had no CRLF. I then invoked the same whitespace-after-content stripping command again: rm -r * git reset --hard HEAD while read f; do sed -i 's/\([^\t ]\)[\t ]*$/\1/' "$f"; done < <(git ls-files '*.lua' '*.tdf' '*.h' '*.glsl' '*.fs' '*.json' '*.txt' '*.css')
esainane
force-pushed
the
spring-upstream-formatting-p2
branch
from
949c03c to
494a40a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 is a follow up from #479
Some issues were missed in the first round, ironically enough due to CRLF in the working tree.
Fixing them CRLF the index doesn't automatically fix them in the working tree, so automated tools expecting native line endings didn't strip all of whitespace we expected them to!
I've also manually adjusted some of the weirder files, containing \r without \n. Whitespace stripping was the final step, so with any luck that will be all.