From 422d4045e5774a1cefff6a155cbe837b3424d00c Mon Sep 17 00:00:00 2001 From: Chuck Atkins <chuck.atkins@kitware.com> Date: Tue, 12 Sep 2017 09:18:03 -0400 Subject: [PATCH] Format: Exclude cmake/upstream from clang-format --- scripts/travis/run-format.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/travis/run-format.sh b/scripts/travis/run-format.sh index ac203f2ce..a679442e0 100755 --- a/scripts/travis/run-format.sh +++ b/scripts/travis/run-format.sh @@ -15,7 +15,7 @@ cd ${SOURCE_DIR} # Check C and C++ code with clang-format echo "Checking formatting for commit range: ${COMMIT_RANGE}" -DIFF="$(./scripts/developer/git/git-clang-format -x '^thirdparty/' --diff ${COMMIT_RANGE})" +DIFF="$(./scripts/developer/git/git-clang-format -x '^(thirdparty|cmake/upstream)/' --diff ${COMMIT_RANGE})" if [ -n "${DIFF}" ] && [ "${DIFF}" != "no modified files to format" ] then echo "clang-format:" -- GitLab