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 <kwrobot@kitware.com>
Merge-request: !1173
This commit is contained in:
Brad King
2017-08-25 15:03:14 +00:00
committed by Kitware Robot
15 changed files with 36 additions and 44 deletions

25
.gitattributes vendored
View File

@@ -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

View File

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

View File

@@ -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%

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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