diff --git a/check-format.sh b/check-format.sh index 509de621..7eae2fdc 100755 --- a/check-format.sh +++ b/check-format.sh @@ -1,10 +1,13 @@ #!/usr/bin/env bash +# Arg used to specify non-'origin/master' comparison branch +ORIGIN_BRANCH=${1:-"origin/master"} + # Run git-clang-format to check for violations if [ "$TRAVIS" == "true" ]; then EXTRA_OPTS="--binary `which clang-format-9`" fi -CLANG_FORMAT_OUTPUT=$(git-clang-format --diff origin/master --extensions c,cpp,h,hpp $EXTRA_OPTS) +CLANG_FORMAT_OUTPUT=$(git-clang-format --diff $ORIGIN_BRANCH --extensions c,cpp,h,hpp $EXTRA_OPTS) # Check for no-ops grep '^no modified files to format$' <<<"$CLANG_FORMAT_OUTPUT" && exit 0