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.stage/master/nightly/2017/08/25
parent
4047003161
commit
8ed03baa76
|
@ -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
|
||||
|
|
|
@ -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@" %*
|
||||
|
|
|
@ -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 @@
|
|||
*.sln-file -crlf whitespace=cr-at-eol
|
||||
*.sln-file eol=crlf
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
.gitattributes export-ignore
|
||||
|
||||
*.sln -crlf
|
||||
*.vcproj -crlf
|
||||
|
||||
* -whitespace
|
|
@ -1 +1 @@
|
|||
*.cmcov -crlf -whitespace
|
||||
*.cmcov eol=crlf
|
||||
|
|
|
@ -1 +1 @@
|
|||
@echo Sample Script Output
|
||||
@echo Sample Script Output
|
||||
|
|
|
@ -1 +1 @@
|
|||
@echo Sample Script Output
|
||||
@echo Sample Script Output
|
||||
|
|
Loading…
Reference in New Issue