Git: Explicitly list binary files as such to avoid EOL change
text=auto works well in Git 2.10+ but it's broken in previous versions, which are still used in production on e.g. Ubuntu 16.04 LTS. Also fix a couple missed text files with CRLF terminators. .bat files likely require it to be processed properly on Windows, but core.autocrlf should take care of converting them on the fly when checking out on Windows.
This commit is contained in:
parent
a1a71c05ba
commit
900d90bb61
3 changed files with 137 additions and 128 deletions
9
.gitattributes
vendored
9
.gitattributes
vendored
|
@ -3,4 +3,13 @@
|
||||||
*.inc linguist-language=cpp
|
*.inc linguist-language=cpp
|
||||||
thirdparty/* linguist-vendored
|
thirdparty/* linguist-vendored
|
||||||
|
|
||||||
|
# Normalize EOL for all files that Git considers text files
|
||||||
* text=auto eol=lf
|
* text=auto eol=lf
|
||||||
|
|
||||||
|
# The above only works properly for Git 2.10+, so for older versions
|
||||||
|
# we need to manually list the binary files we don't want modified.
|
||||||
|
*.icns binary
|
||||||
|
*.ico binary
|
||||||
|
*.jar binary
|
||||||
|
*.png binary
|
||||||
|
*.ttf binary
|
||||||
|
|
Loading…
Reference in a new issue