Explorar o código

Merge topic 'modernize-git-whitespace-attributes'

8ed03baa gitattributes: prefer `eol=crlf` to `-crlf`
40470031 MumpsCoverage: remove unnecessary attribute
d20485d8 gitattributes: prefer `eol=lf` to `crlf=input`
b85c2589 gitattributes: prefer `-text` for binary files
377f3685 gitattributes: remove unused attributes

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1173
Brad King %!s(int64=8) %!d(string=hai) anos
pai
achega
a749fcb3d0

+ 12 - 13
.gitattributes

@@ -8,20 +8,19 @@
 # Do not perform whitespace checks.  Do not format.
 [attr]generated  whitespace=-tab-in-indent,-indent-with-non-tab -format.clang-format
 
-bootstrap        crlf=input
-configure        crlf=input
-*.[1-9]          crlf=input
-*.sh             crlf=input
-*.sh.in          crlf=input
+bootstrap        eol=lf
+configure        eol=lf
+*.[1-9]          eol=lf
+*.sh             eol=lf
+*.sh.in          eol=lf
 
-*.bat           -crlf
-*.bat.in        -crlf
-*.dsp           -crlf
-*.dsw           -crlf
-*.pfx           -crlf
-*.png           -crlf
-*.sln           -crlf
-*.vcproj        -crlf
+*.bat            eol=crlf
+*.bat.in         eol=crlf
+*.sln            eol=crlf
+*.vcproj         eol=crlf
+
+*.pfx            -text
+*.png            -text
 
 *.c              our-c-style
 *.cc             our-c-style

+ 3 - 3
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@" %*

+ 11 - 11
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%

+ 1 - 1
Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes

@@ -1 +1 @@
-*.sln-file      -crlf  whitespace=cr-at-eol
+*.sln-file      eol=crlf

+ 1 - 1
Tests/CMakeTests/.gitattributes

@@ -1 +1 @@
-File-HASH-Input.txt crlf=input
+File-HASH-Input.txt eol=lf

+ 0 - 6
Tests/MFC/mfc1/.gitattributes

@@ -1,6 +0,0 @@
-.gitattributes   export-ignore
-
-*.sln           -crlf
-*.vcproj        -crlf
-
-*               -whitespace

+ 5 - 0
Tests/Module/ExternalData/.gitattributes

@@ -0,0 +1,5 @@
+MD5/*       -text
+SHA1/*      -text
+SHA224/*    -text
+SHA256/*    -text
+SHA3_256/*  -text

+ 0 - 1
Tests/Module/ExternalData/MD5/.gitattributes

@@ -1 +0,0 @@
-*               -crlf

+ 0 - 1
Tests/Module/ExternalData/SHA1/.gitattributes

@@ -1 +0,0 @@
-*               -crlf

+ 0 - 1
Tests/Module/ExternalData/SHA224/.gitattributes

@@ -1 +0,0 @@
-*               -crlf

+ 0 - 1
Tests/Module/ExternalData/SHA256/.gitattributes

@@ -1 +0,0 @@
-*               -crlf

+ 0 - 1
Tests/Module/ExternalData/SHA3_256/.gitattributes

@@ -1 +0,0 @@
-*               -crlf

+ 1 - 2
Tests/MumpsCoverage/.gitattributes

@@ -1,2 +1 @@
-*.cmcov  -crlf  -whitespace
-*.mcov   -crlf  -whitespace
+*.cmcov  eol=crlf

+ 1 - 1
Tests/SimpleInstall/scripts/sample_script.bat

@@ -1 +1 @@
-@echo Sample Script Output
+@echo Sample Script Output

+ 1 - 1
Tests/SimpleInstallS2/scripts/sample_script.bat

@@ -1 +1 @@
-@echo Sample Script Output
+@echo Sample Script Output