diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2017-06-10 14:58:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-10 14:58:42 -0500 |
| commit | 6b6e68776663c0dda04b6a36609297728da2ae9e (patch) | |
| tree | 893a56bd5943397b5c1a25c49d707d4000e7e5a4 /.gitattributes | |
| parent | 29fda8db16e0edab92841277fa223f844f5a92cc (diff) | |
| download | cpython-git-6b6e68776663c0dda04b6a36609297728da2ae9e.tar.gz | |
bpo-27425: Be more explicit in .gitattributes (GH-840)
Updates checked-in line endings on several files.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes index 82694d81f2..5eead66489 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,41 @@ +# Binary data types +*.aif binary +*.aifc binary +*.aiff binary +*.au binary +*.bmp binary +*.exe binary +*.icns binary +*.gif binary +*.ico binary +*.jpg binary *.pck binary -Lib/test/cjkencodings/* binary -Lib/test/decimaltestdata/*.decTest binary +*.png binary +*.psd binary +*.tar binary +*.wav binary +*.whl binary +*.zip binary + +# Specific binary files Lib/test/sndhdrdata/sndhdr.* binary -Lib/test/test_email/data/msg_26.txt binary -Lib/test/xmltestdata/* binary -Lib/venv/scripts/nt/* binary -Lib/test/coding20731.py binary + +# Text files that should not be subject to eol conversion +Lib/test/cjkencodings/* -text +Lib/test/decimaltestdata/*.decTest -text +Lib/test/test_email/data/*.txt -text +Lib/test/xmltestdata/* -text +Lib/test/coding20731.py -text + +# Special files in third party code +Modules/zlib/zlib.map -text + +# CRLF files +*.bat text eol=crlf +*.ps1 text eol=crlf +*.sln text eol=crlf +*.vcxproj* text eol=crlf +*.props text eol=crlf +*.proj text eol=crlf +PCbuild/readme.txt text eol=crlf +PC/readme.txt text eol=crlf |