diff options
author | Brad King <brad.king@kitware.com> | 2017-08-25 15:03:14 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-25 15:04:05 (GMT) |
commit | a749fcb3d0f788b85be0531ffe7e7ec2aaf7f9fa (patch) | |
tree | 5f8807a67c4b5d6059fb13fc884c47ce7b7fe3fe /Tests | |
parent | 9538d22d955a0b101548019003f2d5c7ba833d77 (diff) | |
parent | 8ed03baa766b1170bcfa0574525dc16106bf5b5f (diff) | |
download | CMake-a749fcb3d0f788b85be0531ffe7e7ec2aaf7f9fa.zip CMake-a749fcb3d0f788b85be0531ffe7e7ec2aaf7f9fa.tar.gz CMake-a749fcb3d0f788b85be0531ffe7e7ec2aaf7f9fa.tar.bz2 |
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
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CMakeLib/testVisualStudioSlnParser_data/.gitattributes | 2 | ||||
-rw-r--r-- | Tests/CMakeTests/.gitattributes | 2 | ||||
-rw-r--r-- | Tests/MFC/mfc1/.gitattributes | 6 | ||||
-rw-r--r-- | Tests/Module/ExternalData/.gitattributes | 5 | ||||
-rw-r--r-- | Tests/Module/ExternalData/MD5/.gitattributes | 1 | ||||
-rw-r--r-- | Tests/Module/ExternalData/SHA1/.gitattributes | 1 | ||||
-rw-r--r-- | Tests/Module/ExternalData/SHA224/.gitattributes | 1 | ||||
-rw-r--r-- | Tests/Module/ExternalData/SHA256/.gitattributes | 1 | ||||
-rw-r--r-- | Tests/Module/ExternalData/SHA3_256/.gitattributes | 1 | ||||
-rw-r--r-- | Tests/MumpsCoverage/.gitattributes | 3 | ||||
-rwxr-xr-x | Tests/SimpleInstall/scripts/sample_script.bat | 2 | ||||
-rwxr-xr-x | Tests/SimpleInstallS2/scripts/sample_script.bat | 2 |
12 files changed, 10 insertions, 17 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/CMakeTests/.gitattributes b/Tests/CMakeTests/.gitattributes index c34e350..c6148fb 100644 --- a/Tests/CMakeTests/.gitattributes +++ b/Tests/CMakeTests/.gitattributes @@ -1 +1 @@ -File-HASH-Input.txt crlf=input +File-HASH-Input.txt eol=lf 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/Module/ExternalData/.gitattributes b/Tests/Module/ExternalData/.gitattributes new file mode 100644 index 0000000..516129b --- /dev/null +++ b/Tests/Module/ExternalData/.gitattributes @@ -0,0 +1,5 @@ +MD5/* -text +SHA1/* -text +SHA224/* -text +SHA256/* -text +SHA3_256/* -text diff --git a/Tests/Module/ExternalData/MD5/.gitattributes b/Tests/Module/ExternalData/MD5/.gitattributes deleted file mode 100644 index 3e51d39..0000000 --- a/Tests/Module/ExternalData/MD5/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* -crlf diff --git a/Tests/Module/ExternalData/SHA1/.gitattributes b/Tests/Module/ExternalData/SHA1/.gitattributes deleted file mode 100644 index 3e51d39..0000000 --- a/Tests/Module/ExternalData/SHA1/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* -crlf diff --git a/Tests/Module/ExternalData/SHA224/.gitattributes b/Tests/Module/ExternalData/SHA224/.gitattributes deleted file mode 100644 index 3e51d39..0000000 --- a/Tests/Module/ExternalData/SHA224/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* -crlf diff --git a/Tests/Module/ExternalData/SHA256/.gitattributes b/Tests/Module/ExternalData/SHA256/.gitattributes deleted file mode 100644 index 3e51d39..0000000 --- a/Tests/Module/ExternalData/SHA256/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* -crlf diff --git a/Tests/Module/ExternalData/SHA3_256/.gitattributes b/Tests/Module/ExternalData/SHA3_256/.gitattributes deleted file mode 100644 index 3e51d39..0000000 --- a/Tests/Module/ExternalData/SHA3_256/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* -crlf diff --git a/Tests/MumpsCoverage/.gitattributes b/Tests/MumpsCoverage/.gitattributes index b680612..9fc9b0f 100644 --- a/Tests/MumpsCoverage/.gitattributes +++ b/Tests/MumpsCoverage/.gitattributes @@ -1,2 +1 @@ -*.cmcov -crlf -whitespace -*.mcov -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 |