From 8ed03baa766b1170bcfa0574525dc16106bf5b5f Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 23 Aug 2017 13:23:25 -0400 Subject: gitattributes: prefer `eol=crlf` to `-crlf` The `crlf` attribute is deprecated in Git. This also changes the given files to be in the index using LF newlines, but they will be checked out with CRLF newlines due to the attribute. --- .gitattributes | 8 ++++---- Modules/Platform/GNUtoMS_lib.bat.in | 6 +++--- Modules/SquishRunTestCase.bat | 22 +++++++++++----------- .../testVisualStudioSlnParser_data/.gitattributes | 2 +- Tests/MFC/mfc1/.gitattributes | 6 ------ Tests/MumpsCoverage/.gitattributes | 2 +- Tests/SimpleInstall/scripts/sample_script.bat | 2 +- Tests/SimpleInstallS2/scripts/sample_script.bat | 2 +- 8 files changed, 22 insertions(+), 28 deletions(-) delete mode 100644 Tests/MFC/mfc1/.gitattributes diff --git a/.gitattributes b/.gitattributes index 0943bca..fd878ac 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14,10 +14,10 @@ configure eol=lf *.sh eol=lf *.sh.in eol=lf -*.bat -crlf -*.bat.in -crlf -*.sln -crlf -*.vcproj -crlf +*.bat eol=crlf +*.bat.in eol=crlf +*.sln eol=crlf +*.vcproj eol=crlf *.pfx -text *.png -text diff --git a/Modules/Platform/GNUtoMS_lib.bat.in b/Modules/Platform/GNUtoMS_lib.bat.in index 2da920a..d70aea5 100644 --- a/Modules/Platform/GNUtoMS_lib.bat.in +++ b/Modules/Platform/GNUtoMS_lib.bat.in @@ -1,3 +1,3 @@ -@echo off -call "@CMAKE_GNUtoMS_BAT@" -lib /machine:"@CMAKE_GNUtoMS_ARCH@" %* +@echo off +call "@CMAKE_GNUtoMS_BAT@" +lib /machine:"@CMAKE_GNUtoMS_ARCH@" %* diff --git a/Modules/SquishRunTestCase.bat b/Modules/SquishRunTestCase.bat index 5c5d388..293e88f 100755 --- a/Modules/SquishRunTestCase.bat +++ b/Modules/SquishRunTestCase.bat @@ -1,11 +1,11 @@ -echo 'Starting the squish server...' -start %1 - -echo 'Running the test case...' -%2 --testcase %3 --wrapper %4 --aut %5 -set result=%ERRORLEVEL% - -echo 'Stopping the squish server...' -%1 --stop - -exit \b %result% +echo 'Starting the squish server...' +start %1 + +echo 'Running the test case...' +%2 --testcase %3 --wrapper %4 --aut %5 +set result=%ERRORLEVEL% + +echo 'Stopping the squish server...' +%1 --stop + +exit \b %result% diff --git a/Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes b/Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes index 5be3dc5..08b4ac4 100644 --- a/Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes +++ b/Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes @@ -1 +1 @@ -*.sln-file -crlf whitespace=cr-at-eol +*.sln-file eol=crlf diff --git a/Tests/MFC/mfc1/.gitattributes b/Tests/MFC/mfc1/.gitattributes deleted file mode 100644 index 59be5dc..0000000 --- a/Tests/MFC/mfc1/.gitattributes +++ /dev/null @@ -1,6 +0,0 @@ -.gitattributes export-ignore - -*.sln -crlf -*.vcproj -crlf - -* -whitespace diff --git a/Tests/MumpsCoverage/.gitattributes b/Tests/MumpsCoverage/.gitattributes index cbaead4..9fc9b0f 100644 --- a/Tests/MumpsCoverage/.gitattributes +++ b/Tests/MumpsCoverage/.gitattributes @@ -1 +1 @@ -*.cmcov -crlf -whitespace +*.cmcov eol=crlf diff --git a/Tests/SimpleInstall/scripts/sample_script.bat b/Tests/SimpleInstall/scripts/sample_script.bat index 64a77b5..a9af38c 100755 --- a/Tests/SimpleInstall/scripts/sample_script.bat +++ b/Tests/SimpleInstall/scripts/sample_script.bat @@ -1 +1 @@ -@echo Sample Script Output +@echo Sample Script Output diff --git a/Tests/SimpleInstallS2/scripts/sample_script.bat b/Tests/SimpleInstallS2/scripts/sample_script.bat index 64a77b5..a9af38c 100755 --- a/Tests/SimpleInstallS2/scripts/sample_script.bat +++ b/Tests/SimpleInstallS2/scripts/sample_script.bat @@ -1 +1 @@ -@echo Sample Script Output +@echo Sample Script Output -- cgit v0.12