X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=tools%2Fgit-hooks%2Fpre-commit;fp=tools%2Fgit-hooks%2Fpre-commit;h=9d70e36c11dff6e124a5d9cfcb381a30cc540543;hb=84a92a164950ba9922d526401bd643e057e20891;hp=23e6e6aa2f4b7061ad1e2c5937e08a8643ff822f;hpb=babbf8a33c505679abad4bd1837037751c98b926;p=mirror%2Fdsa-puppet.git

diff --git a/tools/git-hooks/pre-commit b/tools/git-hooks/pre-commit
index 23e6e6aa2..9d70e36c1 100755
--- a/tools/git-hooks/pre-commit
+++ b/tools/git-hooks/pre-commit
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+if ! cmp -s ${PWD}/.git/hooks/pre-commit ${PWD}/tools/git-hooks/pre-commit ; then
+	rm -f ${PWD}/.git/hooks/pre-commit
+	ln -sf ../../tools/git-hooks/pre-commit ${PWD}/.git/hooks/pre-commit
+	exec ${PWD}/.git/hooks/pre-commit
+fi
+
 if git rev-parse --verify HEAD &>/dev/null; then
 	against=HEAD
 else
@@ -15,7 +21,7 @@ check_puppet_manifest () {
         git cat-file blob :0:${file} | sed 's/^import .*/#&/' >${pp}
         trap "rm -f ${pp}" RETURN
 
-        local output=$(puppet apply --noop --ignoreimport ${pp} 2>&1)
+        local output=$(puppet apply --noop ${pp} 2>&1)
         if [ $? -ne 0 ] || [ -n "${output}" ]; then
                 echo '** Syntax check failed:' >&2
                 echo "${output}" >&2