From a7eea8596834869b7362040937d903e92ea12561 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 21 Jan 2022 20:30:12 +0100 Subject: [PATCH 1/3] Use git attr macros for CRLF and no-EOL files --- .gitattributes | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/.gitattributes b/.gitattributes index 05b0420714e1bf6..12752bf4f83f552 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/decimaltestdata/*.decTest noeol +Lib/test/test_email/data/*.txt noeol +Lib/test/xmltestdata/* noeol +Lib/test/coding20731.py noeol +Lib/test/test_importlib/data01/* noeol +Lib/test/test_importlib/namespacedata01/* 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]crlf text eol=crlf + +*.bat crlf +*.ps1 crlf +*.sln crlf +*.vcxproj* crlf +*.props crlf +*.proj crlf +PCbuild/readme.txt crlf +PC/readme.txt crlf # Generated files # https://github.com/github/linguist/blob/master/docs/overrides.md From 061268d332a09ee9a24cccd60680fa6020b3b05f Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Fri, 21 Jan 2022 21:45:17 +0100 Subject: [PATCH 2/3] Sort --- .gitattributes | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 12752bf4f83f552..a5d3836ced86057 100644 --- a/.gitattributes +++ b/.gitattributes @@ -25,24 +25,24 @@ PC/classicAppCompat.* binary [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/xmltestdata/* noeol -Lib/test/coding20731.py noeol Lib/test/test_importlib/data01/* noeol Lib/test/test_importlib/namespacedata01/* noeol +Lib/test/xmltestdata/* noeol # CRLF files [attr]crlf text eol=crlf *.bat crlf +*.proj crlf +*.props crlf *.ps1 crlf *.sln crlf *.vcxproj* crlf -*.props crlf -*.proj crlf -PCbuild/readme.txt crlf PC/readme.txt crlf +PCbuild/readme.txt crlf # Generated files # https://github.com/github/linguist/blob/master/docs/overrides.md From 4a732ef4360c2d4c008b8c6e193b595f9e7ee0c2 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sat, 26 Feb 2022 22:25:29 +0100 Subject: [PATCH 3/3] Use 'dos' iso. 'crlf' --- .gitattributes | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitattributes b/.gitattributes index 49a4cb791bcddcd..80946f4ddf3ba94 100644 --- a/.gitattributes +++ b/.gitattributes @@ -33,16 +33,16 @@ Lib/test/test_importlib/namespacedata01/* noeol Lib/test/xmltestdata/* noeol # CRLF files -[attr]crlf text eol=crlf +[attr]dos text eol=crlf -*.bat crlf -*.proj crlf -*.props crlf -*.ps1 crlf -*.sln crlf -*.vcxproj* crlf -PC/readme.txt crlf -PCbuild/readme.txt 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