summaryrefslogtreecommitdiff
path: root/scripts/clang-tools.sh
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-11-04 15:06:04 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-11-04 16:10:06 +0200
commitf376827ed21115c43347841e346f908697179fd0 (patch)
treede4809a4afd850122dcc13f58b7fd692c1f7c25e /scripts/clang-tools.sh
parent4f40fceb728258e486ffd0b813ddef3e4e2c3cd2 (diff)
downloadqtlocation-mapboxgl-f376827ed21115c43347841e346f908697179fd0.tar.gz
[build] Replace 'tidy' with 'check'
Diffstat (limited to 'scripts/clang-tools.sh')
-rwxr-xr-xscripts/clang-tools.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/clang-tools.sh b/scripts/clang-tools.sh
index fa9825f4a4..b49aadf520 100755
--- a/scripts/clang-tools.sh
+++ b/scripts/clang-tools.sh
@@ -45,17 +45,12 @@ export -f check_tidy check_format
echo "Running clang checks... (this might take a while)"
if [[ -n $2 ]] && [[ $2 == "--diff" ]]; then
- git diff-index --quiet HEAD || {
- echo "Your repository contains unstaged and/or uncommitted changes."
- echo "Please commit all changes before proceeding."
- exit 1
- }
- DIFF_FILES=$(for file in `git diff origin/master..HEAD --name-only | grep "pp$"`; do echo $file; done)
+ DIFF_FILES=$(for file in `git diff origin/master --name-only | grep "pp$"`; do echo $file; done)
if [[ -n $DIFF_FILES ]]; then
echo "${DIFF_FILES}" | xargs -I{} -P ${JOBS} bash -c 'check_tidy --fix' {}
# XXX disabled until we run clang-format over the entire codebase.
#echo "${DIFF_FILES}" | xargs -I{} -P ${JOBS} bash -c 'check_format' {}
- git diff-index --quiet HEAD || {
+ git diff --quiet || {
echo "Changes were made to source files - please review them before committing."
exit 1
}