Skip to content
Snippets Groups Projects
Commit 41575f34 authored by Oleg Hahm's avatar Oleg Hahm
Browse files

Merge pull request #2468 from OlegHahm/make_travis_whining_about_trailing_whitespaces_are_a_nono

Make travis whining about trailing whitespaces are a nono
parents 4f29a775 05fc8493
No related branches found
No related tags found
No related merge requests found
...@@ -44,6 +44,8 @@ script: ...@@ -44,6 +44,8 @@ script:
- make -s -C ./examples/default info-concurrency - make -s -C ./examples/default info-concurrency
- git rebase riot/master || git rebase --abort - git rebase riot/master || git rebase --abort
- ./dist/tools/whitespacecheck/check.sh master || exit
- ./dist/tools/licenses/check.sh master --diff-filter=MR --error-exitcode=0 || exit - ./dist/tools/licenses/check.sh master --diff-filter=MR --error-exitcode=0 || exit
- ./dist/tools/licenses/check.sh master --diff-filter=AC || exit - ./dist/tools/licenses/check.sh master --diff-filter=AC || exit
......
#!/bin/sh
# Copyright 2015 Oliver Hahm <oliver.hahm@inria.fr>
#
# This file is subject to the terms and conditions of the GNU Lesser
# General Public License v2.1. See the file LICENSE in the top level
# directory for more details.
# If no branch but an option is given, unset BRANCH.
# Otherwise, consume this parameter.
BRANCH="${1}"
if echo "${BRANCH}" | grep -q '^-'; then
if [ $(git rev-parse --abbrev-ref HEAD) != "master" ]; then
BRANCH="master"
else
BRANCH=""
fi
else
if [ -n "${BRANCH}" ]; then
shift 1
fi
fi
# select files to check
if [ -z "${BRANCH}" ]; then
BRANCH=$(git rev-list HEAD | tail -n 1)
fi
git diff --check $(git merge-base ${BRANCH} HEAD) > /dev/null
if [ $? -gt 0 ]
then
echo "ERROR: This change introduces new whitespace errors"
exit 1
else
exit 0
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment