This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via a749fcb3d0f788b85be0531ffe7e7ec2aaf7f9fa (commit)
via 8ed03baa766b1170bcfa0574525dc16106bf5b5f (commit)
via 4047003161e0e1e5f9c68e04d3eec4caa97dc90a (commit)
via d20485d8d983e1bc9de18289773168ddf2dafb6d (commit)
via b85c2589a1a22fb46620d7b0fd8aa6ec28ac5670 (commit)
via 377f3685fc0f3af67829c808b791d0db72f377a6 (commit)
from 9538d22d955a0b101548019003f2d5c7ba833d77 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a749fcb3d0f788b85be0531ffe7e7ec2aaf7f9fa
commit a749fcb3d0f788b85be0531ffe7e7ec2aaf7f9fa
Merge: 9538d22 8ed03ba
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Aug 25 15:03:14 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Aug 25 11:04:05 2017 -0400
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 <kwro...@kitware.com>
Merge-request: !1173
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ed03baa766b1170bcfa0574525dc16106bf5b5f
commit 8ed03baa766b1170bcfa0574525dc16106bf5b5f
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Aug 23 13:23:25 2017 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Aug 23 13:31:41 2017 -0400
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.
diff --git a/.gitattributes b/.gitattributes
index 0943bca..fd878ac 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -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
diff --git a/Modules/Platform/GNUtoMS_lib.bat.in
b/Modules/Platform/GNUtoMS_lib.bat.in
index 2da920a..d70aea5 100644
--- a/Modules/Platform/GNUtoMS_lib.bat.in
+++ b/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@" %*
diff --git a/Modules/SquishRunTestCase.bat b/Modules/SquishRunTestCase.bat
index 5c5d388..293e88f 100755
--- a/Modules/SquishRunTestCase.bat
+++ b/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%
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
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4047003161e0e1e5f9c68e04d3eec4caa97dc90a
commit 4047003161e0e1e5f9c68e04d3eec4caa97dc90a
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Aug 23 13:30:59 2017 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Aug 23 13:31:31 2017 -0400
MumpsCoverage: remove unnecessary attribute
The file has Unix newline endings.
diff --git a/Tests/MumpsCoverage/.gitattributes
b/Tests/MumpsCoverage/.gitattributes
index b680612..cbaead4 100644
--- a/Tests/MumpsCoverage/.gitattributes
+++ b/Tests/MumpsCoverage/.gitattributes
@@ -1,2 +1 @@
*.cmcov -crlf -whitespace
-*.mcov -crlf -whitespace
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d20485d8d983e1bc9de18289773168ddf2dafb6d
commit d20485d8d983e1bc9de18289773168ddf2dafb6d
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Aug 23 13:21:56 2017 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Aug 23 13:30:00 2017 -0400
gitattributes: prefer `eol=lf` to `crlf=input`
The `crlf` attribute is deprecated in Git.
diff --git a/.gitattributes b/.gitattributes
index 14aa49e..0943bca 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,11 +8,11 @@
# 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
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
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b85c2589a1a22fb46620d7b0fd8aa6ec28ac5670
commit b85c2589a1a22fb46620d7b0fd8aa6ec28ac5670
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Aug 23 13:21:36 2017 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Aug 23 13:30:00 2017 -0400
gitattributes: prefer `-text` for binary files
diff --git a/.gitattributes b/.gitattributes
index e43ccbb..14aa49e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -16,11 +16,12 @@ configure crlf=input
*.bat -crlf
*.bat.in -crlf
-*.pfx -crlf
-*.png -crlf
*.sln -crlf
*.vcproj -crlf
+*.pfx -text
+*.png -text
+
*.c our-c-style
*.cc our-c-style
*.cpp our-c-style
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
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=377f3685fc0f3af67829c808b791d0db72f377a6
commit 377f3685fc0f3af67829c808b791d0db72f377a6
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Wed Aug 23 13:21:03 2017 -0400
Commit: Ben Boeckel <ben.boec...@kitware.com>
CommitDate: Wed Aug 23 13:21:03 2017 -0400
gitattributes: remove unused attributes
diff --git a/.gitattributes b/.gitattributes
index 3829160..e43ccbb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -16,8 +16,6 @@ configure crlf=input
*.bat -crlf
*.bat.in -crlf
-*.dsp -crlf
-*.dsw -crlf
*.pfx -crlf
*.png -crlf
*.sln -crlf
-----------------------------------------------------------------------
Summary of changes:
.gitattributes | 25 ++++++++++----------
Modules/Platform/GNUtoMS_lib.bat.in | 6 ++---
Modules/SquishRunTestCase.bat | 22 ++++++++---------
.../testVisualStudioSlnParser_data/.gitattributes | 2 +-
Tests/CMakeTests/.gitattributes | 2 +-
Tests/MFC/mfc1/.gitattributes | 6 -----
Tests/Module/ExternalData/.gitattributes | 5 ++++
Tests/Module/ExternalData/MD5/.gitattributes | 1 -
Tests/Module/ExternalData/SHA1/.gitattributes | 1 -
Tests/Module/ExternalData/SHA224/.gitattributes | 1 -
Tests/Module/ExternalData/SHA256/.gitattributes | 1 -
Tests/Module/ExternalData/SHA3_256/.gitattributes | 1 -
Tests/MumpsCoverage/.gitattributes | 3 +--
Tests/SimpleInstall/scripts/sample_script.bat | 2 +-
Tests/SimpleInstallS2/scripts/sample_script.bat | 2 +-
15 files changed, 36 insertions(+), 44 deletions(-)
delete mode 100644 Tests/MFC/mfc1/.gitattributes
create mode 100644 Tests/Module/ExternalData/.gitattributes
delete mode 100644 Tests/Module/ExternalData/MD5/.gitattributes
delete mode 100644 Tests/Module/ExternalData/SHA1/.gitattributes
delete mode 100644 Tests/Module/ExternalData/SHA224/.gitattributes
delete mode 100644 Tests/Module/ExternalData/SHA256/.gitattributes
delete mode 100644 Tests/Module/ExternalData/SHA3_256/.gitattributes
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
