diff options
author | Nils Adermann <naderman@naderman.de> | 2010-04-04 15:04:28 +0200 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2010-04-04 15:04:28 +0200 |
commit | fa9510be23e76b8729e2ea16fc0e8403c7a3643c (patch) | |
tree | 19d0854ef685aa35b2013de58a3a80d9fb8bc5c2 /git-tools/hooks/pre-commit | |
parent | 43774ef423d205250181c7413585ecd4d9ad6388 (diff) | |
parent | 11de6a46b10c5bdb77b2ee7f9e970b849e0f4d74 (diff) | |
download | forums-fa9510be23e76b8729e2ea16fc0e8403c7a3643c.tar forums-fa9510be23e76b8729e2ea16fc0e8403c7a3643c.tar.gz forums-fa9510be23e76b8729e2ea16fc0e8403c7a3643c.tar.bz2 forums-fa9510be23e76b8729e2ea16fc0e8403c7a3643c.tar.xz forums-fa9510be23e76b8729e2ea16fc0e8403c7a3643c.zip |
Merge branch 'feature/evil3/git-tools' into develop-olympus
* feature/evil3/git-tools:
[git-tools] add note about PHP_BIN using env
[git-tools] do not display stderr
[git-tools] Prepend the branch to the commit message for all branches.
[git-tools] Use env to find the correct paths to binaries.
[git-tools] Display what parse errors were found.
[git-tools] This script requires bash to run, so point directly to bash.
[git-tools] Improvements for the pre-commit hook
[git-tools] Improvements on prepare-commt-msg hook
[git-tools] Some pre-commit enhancements, abolish tempfile
[git-tools] use mktemp in pre-commit (thanks nn-)
[git-tools] pre-commit hook for syntax checking
Diffstat (limited to 'git-tools/hooks/pre-commit')
-rwxr-xr-x | git-tools/hooks/pre-commit | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit new file mode 100755 index 0000000000..23ab8d6cdb --- /dev/null +++ b/git-tools/hooks/pre-commit @@ -0,0 +1,72 @@ +#!/usr/bin/env bash +# +# A hook to disallow php syntax errors to be committed +# by running php -l (lint) on them. It requires php-cli +# to be installed. +# +# This is a pre-commit hook. +# +# To install this you can either copy or symlink it to +# $GIT_DIR/hooks, example: +# +# ln -s ../../git-tools/hooks/pre-commit \\ +# .git/hooks/pre-commit + +# NOTE: this is run through /usr/bin/env +PHP_BIN=php + +# necessary check for initial commit +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +error=0 +errors="" + +IFS=$'\n' +# get a list of staged files +for line in $(git diff-index --cached --full-index $against) +do + # split needed values + sha=$(echo $line | cut -d' ' -f4) + temp=$(echo $line | cut -d' ' -f5) + status=$(echo $temp | cut -d' ' -f1) + filename=$(echo $temp | cut -d' ' -f2) + + # file extension + ext=$(echo $filename | sed 's/^.*\.//') + + # only check files with php extension + if [ $ext != "php" ] + then + continue + fi + + # do not check deleted files + if [ $status = "D" ] + then + continue + fi + + # check the staged file content for syntax errors + # using php -l (lint) + result=$(git cat-file -p $sha | /usr/bin/env $PHP_BIN -l 2>/dev/null) + if [ $? -ne 0 ] + then + error=1 + # Swap back in correct filenames + errors+=${result//in - on/"$filename"} + fi +done +unset IFS + +if [ $error -eq 1 ] +then + echo -e "PHP Syntax check failed:"; + echo -e "$errors" | grep "^Parse error:" + exit 1 +fi |