Skip to content

Conversation

@esainane
Copy link

This is a follow up from #711

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 - I didn't follow my own advice from ZeroK-RTS/Zero-K@0efc50f when it came to doing it with Chobby - so automated tools expecting native line endings didn't strip all 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.

\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')
@GoogleFrog GoogleFrog merged commit 6ec6840 into ZeroK-RTS:master Aug 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants