From f0509e4620643549caa7a486d54b12d53617ab94 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Tue, 22 Jun 2010 14:42:02 +0200
Subject: [task/git-tools] append ticket id to git log message

PHPBB3-9770
---
 git-tools/hooks/prepare-commit-msg | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'git-tools/hooks/prepare-commit-msg')

diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg
index 033cb187c7..ab01f49b5a 100755
--- a/git-tools/hooks/prepare-commit-msg
+++ b/git-tools/hooks/prepare-commit-msg
@@ -32,3 +32,10 @@ if [ "$2" = "" ]
 then
 	echo "[$branch] $(cat "$1")" > "$1"
 fi
+
+if (echo $branch | grep '^ticket/')
+then
+	ticket_id="$(echo $branch | sed "s/ticket\///g")"
+	echo >> "$1"
+	echo "PHPBB3-$ticket_id" >> "$1"
+fi
-- 
cgit v1.2.1


From 6b2f4b6a850493fa0277ae38ee816d7c5a3a2311 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Tue, 22 Jun 2010 16:42:29 +0200
Subject: [task/git-tools] move ticket id appending to commit-msg hook

PHPBB3-9770
---
 git-tools/hooks/prepare-commit-msg | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'git-tools/hooks/prepare-commit-msg')

diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg
index ab01f49b5a..033cb187c7 100755
--- a/git-tools/hooks/prepare-commit-msg
+++ b/git-tools/hooks/prepare-commit-msg
@@ -32,10 +32,3 @@ if [ "$2" = "" ]
 then
 	echo "[$branch] $(cat "$1")" > "$1"
 fi
-
-if (echo $branch | grep '^ticket/')
-then
-	ticket_id="$(echo $branch | sed "s/ticket\///g")"
-	echo >> "$1"
-	echo "PHPBB3-$ticket_id" >> "$1"
-fi
-- 
cgit v1.2.1


From bfa7b287344462bbd6f8a0f02810f7a6b225f65a Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Thu, 8 Jul 2010 00:27:45 +0100
Subject: [task/git-tools] Append ticket identifier to commit message prior to
 editing.

PHPBB3-9770
---
 git-tools/hooks/prepare-commit-msg | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'git-tools/hooks/prepare-commit-msg')

diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg
index 033cb187c7..2bf25e58a4 100755
--- a/git-tools/hooks/prepare-commit-msg
+++ b/git-tools/hooks/prepare-commit-msg
@@ -30,5 +30,13 @@ branch="$(echo "$branch" | sed "s/refs\/heads\///g")"
 # * also make sure the branch name begins with bug/ or feature/
 if [ "$2" = "" ]
 then
-	echo "[$branch] $(cat "$1")" > "$1"
+	tail="";
+
+	# Branch is prefixed with 'ticket/', append ticket ID to message
+	if [ "$branch" != "${branch##ticket/}" ];
+	then
+		tail="\n\nPHPBB3-${branch##ticket/}";
+	fi
+
+	echo "[$branch]$tail $(cat "$1")" > "$1"
 fi
-- 
cgit v1.2.1