From d7a38fd7ef2bea57107968014cf63652372b45c1 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Tue, 1 Mar 2011 20:40:35 -0500
Subject: [ticket/9824] Allow empty lines after ticket reference.

PHPBB3-9824
---
 git-tools/hooks/commit-msg | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'git-tools/hooks')

diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
index 1d33995162..319e27b811 100755
--- a/git-tools/hooks/commit-msg
+++ b/git-tools/hooks/commit-msg
@@ -139,6 +139,10 @@ do
 				# Should not end up here
 				false
 			;;
+			"possibly-eof")
+				# Allow empty and/or comment lines at the end
+				! tail -n +"$i" "$1" |grep -qvE '^($|#)'
+			;;
 			"comment")
 				echo "$line" | grep -Eq "^#";
 			;;
@@ -199,7 +203,7 @@ do
 				in_description=1;
 			;;
 			"footer")
-				expecting="footer eof";
+				expecting="footer possibly-eof";
 				if [ "$tickets" = "" ]
 				then
 					tickets="$line";
@@ -210,6 +214,9 @@ do
 			"comment")
 				# Comments should expect the same thing again
 			;;
+			"possibly-eof")
+				expecting="eof";
+			;;
 			*)
 				echo "Unrecognised token $expect" >&2;
 				quit 254;
-- 
cgit v1.2.1