diff options
| author | Erlend Egeberg Aasland <erlend.aasland@innova.no> | 2022-04-17 20:53:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-17 20:53:31 (GMT) |
| commit | 0b906ae562fa057162a67d4a5b7ea426f6b9dd23 (patch) | |
| tree | 0e9c171db316b03f043c074a3abec56dd65b771f /.gitattributes | |
| parent | cec5d858f509ea28a5325b75fd94e2f275866f5f (diff) | |
| download | cpython-0b906ae562fa057162a67d4a5b7ea426f6b9dd23.zip cpython-0b906ae562fa057162a67d4a5b7ea426f6b9dd23.tar.gz cpython-0b906ae562fa057162a67d4a5b7ea426f6b9dd23.tar.bz2 | |
Use git attribute macros for CRLF and no-EOL files (GH-30762)
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/.gitattributes b/.gitattributes index bc513e4..d956a45 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,23 +22,27 @@ Lib/test/sndhdrdata/sndhdr.* binary PC/classicAppCompat.* 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 -Lib/test/test_importlib/data01/* -text -Lib/test/test_importlib/namespacedata01/* -text +[attr]noeol -text + +Lib/test/cjkencodings/* noeol +Lib/test/coding20731.py noeol +Lib/test/decimaltestdata/*.decTest noeol +Lib/test/test_email/data/*.txt noeol +Lib/test/test_importlib/data01/* noeol +Lib/test/test_importlib/namespacedata01/* noeol +Lib/test/xmltestdata/* noeol # 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 +[attr]dos text eol=crlf + +*.bat dos +*.proj dos +*.props dos +*.ps1 dos +*.sln dos +*.vcxproj* dos +PC/readme.txt dos +PCbuild/readme.txt dos # Language aware diff headers # https://tekin.co.uk/2020/10/better-git-diff-output-for-ruby-python-elixir-and-more |