diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-03 01:07:19 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-03 01:07:19 +0100 |
| commit | 32536880f4b1fd853a07865c2b55febbfe7a994c (patch) | |
| tree | 2a863a0743edf1f62b8c03b164632e780a094079 | |
| parent | 34c6677d1401a812ae7230d36428aa48d10622f9 (diff) | |
| parent | 16e81d4d18ec98ed853acd834886b69349ca53c9 (diff) | |
| download | forums-32536880f4b1fd853a07865c2b55febbfe7a994c.tar forums-32536880f4b1fd853a07865c2b55febbfe7a994c.tar.gz forums-32536880f4b1fd853a07865c2b55febbfe7a994c.tar.bz2 forums-32536880f4b1fd853a07865c2b55febbfe7a994c.tar.xz forums-32536880f4b1fd853a07865c2b55febbfe7a994c.zip | |
Merge remote-tracking branch 'github-bantu/ticket/11509' into develop-olympus
* github-bantu/ticket/11509:
[ticket/11509] Fail on Travis CI if commit messages are improperly formatted.
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | git-tools/commit-msg-hook-range.sh | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 18bd25e725..4df4bc896a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,3 +24,4 @@ before_script: script: - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then phpunit --configuration travis/phpunit-$DB-travis.xml; else phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi" + - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh $TRAVIS_COMMIT_RANGE; fi" diff --git a/git-tools/commit-msg-hook-range.sh b/git-tools/commit-msg-hook-range.sh new file mode 100755 index 0000000000..66628c1d17 --- /dev/null +++ b/git-tools/commit-msg-hook-range.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# +# @copyright (c) 2014 phpBB Group +# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +# +# Calls the git commit-msg hook on all non-merge commits in a given commit range. +# +set -e + +if [ "$#" -ne 1 ]; +then + echo "Expected one argument (commit range, e.g. eef1b586...1666476b)." + exit +fi + +DIR=$(dirname "$0") +COMMIT_MSG_HOOK_PATH="$DIR/hooks/commit-msg" + +COMMIT_RANGE="$1" + +for COMMIT_HASH in $(git rev-list --no-merges "$COMMIT_RANGE") +do + # The git commit-msg hook takes a path to a file containing a commit + # message. So we have to extract the commit message into a file first, + # which then also needs to be deleted after our work is done. + COMMIT_MESSAGE_PATH="$DIR/commit_msg.$COMMIT_HASH" + git log -n 1 --pretty=format:%B "$COMMIT_HASH" > "$COMMIT_MESSAGE_PATH" + "$COMMIT_MSG_HOOK_PATH" "$COMMIT_MESSAGE_PATH" + rm "$COMMIT_MESSAGE_PATH" +done |