diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2017-08-23 17:23:25 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2017-08-23 17:31:41 (GMT) |
| commit | 8ed03baa766b1170bcfa0574525dc16106bf5b5f (patch) | |
| tree | 26a7683403db90aed1c8d6dbe9dc9fa701f69037 /Tests | |
| parent | 4047003161e0e1e5f9c68e04d3eec4caa97dc90a (diff) | |
| download | CMake-8ed03baa766b1170bcfa0574525dc16106bf5b5f.zip CMake-8ed03baa766b1170bcfa0574525dc16106bf5b5f.tar.gz CMake-8ed03baa766b1170bcfa0574525dc16106bf5b5f.tar.bz2 | |
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.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes | 2 | ||||
| -rw-r--r-- | Tests/MFC/mfc1/.gitattributes | 6 | ||||
| -rw-r--r-- | Tests/MumpsCoverage/.gitattributes | 2 | ||||
| -rwxr-xr-x | Tests/SimpleInstall/scripts/sample_script.bat | 2 | ||||
| -rwxr-xr-x | Tests/SimpleInstallS2/scripts/sample_script.bat | 2 |
5 files changed, 4 insertions, 10 deletions
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 |