riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7631 from smlng/tools/whitespace/ignore_vendor

Browse Source 
tools: ignore vendor files on whitespace check
This commit is contained in:
Martine Lenders 2017-09-20 15:33:12 +02:00 committed by GitHub
commit 88e574871e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/tools/whitespacecheck/check.sh vendored
View File

@ -6,6 +6,8 @@
# General Public License v2.1. See the file LICENSE in the top level # General Public License v2.1. See the file LICENSE in the top level
# directory for more details. # directory for more details.
NOVENDOR=":!*/include/vendor/*"
# If no branch but an option is given, unset BRANCH. # If no branch but an option is given, unset BRANCH.
# Otherwise, consume this parameter. # Otherwise, consume this parameter.
BRANCH="${1}" BRANCH="${1}"
@ -28,14 +30,14 @@ if [ -z "${BRANCH}" ]; then
fi fi
git -c core.whitespace="tab-in-indent,tabwidth=4" \ git -c core.whitespace="tab-in-indent,tabwidth=4" \
diff --check $(git merge-base ${BRANCH} HEAD) -- *.[ch] diff --check $(git merge-base ${BRANCH} HEAD) -- *.[ch] ${NOVENDOR}
RESULT=$? RESULT=$?
# Git regards any trailing white space except `\n` as an error so `\r` is # Git regards any trailing white space except `\n` as an error so `\r` is
# checked here, too # checked here, too
git -c core.whitespace="trailing-space" \ git -c core.whitespace="trailing-space" \
diff --check $(git merge-base ${BRANCH} HEAD) diff --check $(git merge-base ${BRANCH} HEAD) -- . ${NOVENDOR}
if [ $? -ne 0 ] || [ $RESULT -ne 0 ] if [ $? -ne 0 ] || [ $RESULT -ne 0 ]
then then
echo "ERROR: This change introduces new whitespace errors" echo "ERROR: This change introduces new whitespace errors"