[Cmake-commits] CMake branch, master, updated. v3.9.4-1063-ge2f05c7

[Kitware Robot]

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  e2f05c731017a3826b0a185e2fc186e61db30849 (commit)
       via  574d694337213da88ded3380cce91ae9478fb579 (commit)
      from  0e1ef0ca397db5f0292a218dadc997a7690205cd (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=e2f05c731017a3826b0a185e2fc186e61db30849
commit e2f05c731017a3826b0a185e2fc186e61db30849
Merge: 0e1ef0c 574d694
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 4 13:46:31 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Oct 4 09:46:40 2017 -0400

    Merge topic 'clang-format'
    
    574d6943 clang-format.bash: minor fixes to support MacOS
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1339


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=574d694337213da88ded3380cce91ae9478fb579
commit 574d694337213da88ded3380cce91ae9478fb579
Author:     Matthias Maennich <matthias at maennich.net>
AuthorDate: Tue Oct 3 22:16:07 2017 +0200
Commit:     Matthias Maennich <matthias at maennich.net>
CommitDate: Tue Oct 3 22:16:07 2017 +0200

    clang-format.bash: minor fixes to support MacOS
    
    - sed on Mac does not support embedded sed statements, hence eliminating
      the non-matches via grep
    
    - xargs on Mac does not support -d, but does support -0, hence replacing

diff --git a/Utilities/Scripts/clang-format.bash b/Utilities/Scripts/clang-format.bash
index 428a9e4..3b331a1 100755
--- a/Utilities/Scripts/clang-format.bash
+++ b/Utilities/Scripts/clang-format.bash
@@ -111,7 +111,9 @@ $git_ls |
 
   # Select sources with our attribute.
   git check-attr --stdin format.clang-format |
-  sed -n '/: format\.clang-format: set$/ {s/:[^:]*:[^:]*$//p}'  |
+  grep -e ': format\.clang-format: set$'     |
+  sed -n 's/:[^:]*:[^:]*$//p'                |
 
   # Update sources in-place.
-  xargs -d '\n' "$clang_format" -i
+  tr '\n' '\0'                               |
+  xargs -0 "$clang_format" -i

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Scripts/clang-format.bash |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake