[Cmake-commits] CMake branch, master, updated. v3.9.0-rc5-221-g1c73f35
Kitware Robot
kwrobot at kitware.com
Wed Jul 5 13:05:04 EDT 2017
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 1c73f354a36211771539bf396875bcbade8a383f (commit)
via 16d495253b45ae802ac0d78bc33f6caaa5285370 (commit)
from 295d9bf2bd795da551d5ac266c53eeac2de45a71 (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=1c73f354a36211771539bf396875bcbade8a383f
commit 1c73f354a36211771539bf396875bcbade8a383f
Merge: 295d9bf 16d4952
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 5 16:56:52 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jul 5 12:56:55 2017 -0400
Merge topic 'clang-format-missing'
16d49525 clang-format.bash: Fix error message when clang-format is not found
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1029
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16d495253b45ae802ac0d78bc33f6caaa5285370
commit 16d495253b45ae802ac0d78bc33f6caaa5285370
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 5 12:55:03 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 5 12:55:03 2017 -0400
clang-format.bash: Fix error message when clang-format is not found
Do not refer to a variable we just determined is empty to get the
name of the tool for the error message. Just hard-code the name.
diff --git a/Utilities/Scripts/clang-format.bash b/Utilities/Scripts/clang-format.bash
index edcda77..428a9e4 100755
--- a/Utilities/Scripts/clang-format.bash
+++ b/Utilities/Scripts/clang-format.bash
@@ -92,7 +92,7 @@ fi
# Verify that we have a tool.
if ! type -p "$clang_format" >/dev/null; then
- echo "Unable to locate '$clang_format'"
+ echo "Unable to locate a 'clang-format' tool."
exit 1
fi
-----------------------------------------------------------------------
Summary of changes:
Utilities/Scripts/clang-format.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list