From: Junio C Hamano <junkio@cox.net>
Date: Mon, 21 Nov 2005 18:59:31 +0000 (-0800)
Subject: Fix hooks/update template.
X-Git-Tag: v0.99.9k^2~40
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=60abce3c0f41952de7dc1a4abefcb988898b71a4;p=git.git

Fix hooks/update template.

Make the example address RFC2606 (aka BCP0032) compliant.  Also
fix a couple of shell script errors.

Noted and fixed by Matthew Wilcox and Andreas Ericsson.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/templates/hooks--update b/templates/hooks--update
index 3f38b82a4..6db555f65 100644
--- a/templates/hooks--update
+++ b/templates/hooks--update
@@ -8,14 +8,14 @@
 # (2) make this file executable by "chmod +x update".
 #
 
-recipient="commit-list@mydomain.xz"
+recipient="commit-list@example.com"
 
 if expr "$2" : '0*$' >/dev/null
 then
 	echo "Created a new ref, with the following commits:"
 	git-rev-list --pretty "$3"
 else
-	$base=$(git-merge-base "$2" "$3")
+	base=$(git-merge-base "$2" "$3")
 	case "$base" in
 	"$2")
 		echo "New commits:"
@@ -24,8 +24,7 @@ else
 		echo "Rebased ref, commits from common ancestor:"
 		;;
 	esac
-fi
-git-rev-list --pretty "$3" "^$base"
+	git-rev-list --pretty "$3" "^$base"
 fi |
 mail -s "Changes to ref $1" "$recipient"
 exit 0