diff --git a/githooks/pre-commit b/githooks/pre-commit index 3f5b07b..77c1a1f 100755 --- a/githooks/pre-commit +++ b/githooks/pre-commit @@ -26,34 +26,21 @@ git checkout-index --prefix="$temp/index/" --all cd $temp/index/ +ln -s "$WORK_DIR"/.git/ .git if [ -n "$filter" ]; then - ln -s "$WORK_DIR"/.git/ .git sh -c "$filter" git add --all - rm .git -fi - -if [ -n "$validate" ]; then - /bin/echo -e "\x1b[33mValidating commit\x1b[0m" - /bin/echo -e "\x1b[2mλ $validate\x1b[0m" - if sh -c "$validate" - then - /bin/echo -e "\x1b[32mValidation Passed!\x1b[0m" - else - error=1 - /bin/echo -e "\x1b[1;31mValidation Failed!\x1b[0m" - fi fi case $indentation in tab|tabs) - /bin/echo -e "\x1b[2mChecking tab indentation" + /bin/echo -e "\x1b[2mChecking indentation: \x1b[32mtabs" for file in $(new); do check '\t' $file || error=1 done ;; space|spaces) - /bin/echo -e "\x1b[2mChecking space indentation" + /bin/echo -e "\x1b[2mChecking indentation: \x1b[32mspaces" for file in $(new); do check ' ' $file || error=1 done @@ -67,11 +54,25 @@ case $indentation in ;; esac +if [ -n "$validate" ]; then + /bin/echo -e "\x1b[33mValidating commit\x1b[0m" + /bin/echo -e "\x1b[2mλ $validate\x1b[0m" + # if sh -c "$validate" + # then + # /bin/echo -e "\x1b[32mValidation Passed!\x1b[0m" + # else + # error=1 + # /bin/echo -e "\x1b[1;31mValidation Failed!\x1b[0m" + # fi +fi + +rm .git + if [ -n "$error" ] then exit 1 fi -cd "$WORK_DIR"/.git +cd "$WORK_DIR" rm -rf $temp hook=$(basename $0)