summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJosef Weidendorfer <Josef.Weidendorfer@gmx.de>2005-08-13 20:39:41 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-15 10:00:21 (GMT)
commitc65a9470fbaa57b9b815addde51ad22648f6d353 (patch)
treebc97e6b020be43446d7b04753d90a3fc9721bfb4 /templates
parentaae4f42c45704986210ea2a30bd31afba1008275 (diff)
downloadgit-c65a9470fbaa57b9b815addde51ad22648f6d353.zip
git-c65a9470fbaa57b9b815addde51ad22648f6d353.tar.gz
git-c65a9470fbaa57b9b815addde51ad22648f6d353.tar.bz2
[PATCH] Fixed/Extended example for update hook
Add sample code to distinguish --force rebased head and simple fast-forward. At the same time fixes a real bug; the "new ref" path was using a wrong parameter. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'templates')
-rw-r--r--templates/hooks--update12
1 files changed, 9 insertions, 3 deletions
diff --git a/templates/hooks--update b/templates/hooks--update
index 540ade0..0726975 100644
--- a/templates/hooks--update
+++ b/templates/hooks--update
@@ -1,6 +1,7 @@
#!/bin/sh
#
# An example hook script to mail out commit update information.
+# Called by git-receive-pack with arguments: refname sha1-old sha1-new
#
# To enable this hook:
# (1) change the recipient e-mail address
@@ -12,10 +13,15 @@ recipient="commit-list@mydomain.xz"
if expr "$2" : '0*$' >/dev/null
then
echo "Created a new ref, with the following commits:"
- git-rev-list --pretty "$2"
+ git-rev-list --pretty "$3"
else
- echo "New commits:"
- git-rev-list --pretty "$3" "^$2"
+ $base=$(git-merge-base "$2" "$3")
+ if [ $base == "$2" ]; then
+ echo "New commits:"
+ else
+ echo "Rebased ref, commits from common ancestor:"
+fi
+git-rev-list --pretty "$3" "^$base"
fi |
mail -s "Changes to ref $1" "$recipient"
exit 0