aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2010-07-12 02:04:29 +0100
committerChris Smith <toonarmy@phpbb.com>2010-08-10 14:48:46 +0100
commita9046e5608ed362c7123cb006adab7102cd58e63 (patch)
tree491bfd1d9eda3d46fbcdc153967ac1dad0828363 /git-tools/hooks
parent[task/git-tools] Vastly expanded commit-msg hook. (diff)
downloadphpbb-a9046e5608ed362c7123cb006adab7102cd58e63.tar.gz
phpbb-a9046e5608ed362c7123cb006adab7102cd58e63.tar.bz2
phpbb-a9046e5608ed362c7123cb006adab7102cd58e63.zip
[task/git-tools] Adjust the hook to enforce that a ticket is always mentioned
PHPBB3-9768
Diffstat (limited to 'git-tools/hooks')
-rwxr-xr-xgit-tools/hooks/commit-msg4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 894e67aa09..b04a761c29 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -157,7 +157,7 @@ do
# Successful match, but on which line format
case $expect in
"header")
- expecting="empty eof";
+ expecting="empty";
echo "$line" | grep -Eq "^\[ticket/[0-9]+\]$" && (
ticket=$(echo "$line" | sed 's,\[ticket/\([0-9]*\)\].*,\1,');
@@ -174,7 +174,7 @@ do
fi
;;
"description")
- expecting="description empty eof";
+ expecting="description empty";
in_description=1;
;;
"footer")