Add display_error_message to reduce duplication.

[git-central.git] / server / update-ensure-ticket-reference

diff --git a/server/update-ensure-ticket-reference b/server/update-ensure-ticket-reference
index 5d6014c..3dc9c29 100644 (file)
--- a/server/update-ensure-ticket-reference
+++ b/server/update-ensure-ticket-reference
@@ -1,10 +1,27 @@
 #!/bin/sh
 
+. $(dirname $0)/functions
+
 # Command line
 refname="$1"
 oldrev="$2"
 newrev="$3"
 
+# We only care about branches moving--ignore tags/etc.
+case "$refname" in
+       refs/heads/*)
+               short_refname=${refname##refs/heads/}
+               ;;
+       *)
+               exit 0
+               ;;
+esac
+
+excused=" $(git config hooks.update-ensure-ticket-reference.excused) "
+if [[ $excused =~ " $short_refname " ]] ; then
+       exit 0
+fi
+
 if expr "$oldrev" : '0*$' >/dev/null ; then
        git rev-parse --not --branches | git rev-list --stdin --no-merges $newrev
 else
@@ -13,11 +30,7 @@ fi | while read commit ; do
        # Have log dump the "subject line, new line, body" of each commit message for grepping
        git log -n 1 '--pretty=format:%s%n%b' "$commit" | grep -i '\(\(re\|refs\|qa\) #[0-9]\+\)\|\(no ticket\)' > /dev/null
        if [ $? -ne 0 ] ; then
-               echo "----------------------------------------------------" >&2
-               echo "" >&2
-               echo "Commit $commit does not reference a ticket" >&2
-               echo "" >&2
-               echo "----------------------------------------------------" >&2
+               display_error_message "Commit $commit does not reference a ticket"
                exit 1
        fi
 done