[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>

diff --git a/templates/hooks--update b/templates/hooks--update
index 540ade0d52c84d59bbdd863f60a0e90203643ff2..0726975367de1bff2d4575537f89f52ff87fa1a7 100644 (file)
--- a/templates/hooks--update
+++ b/templates/hooks--update
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # An example hook script to mail out commit update information.
 #!/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
 #
 # 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:"
 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
 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
 fi |
 mail -s "Changes to ref $1" "$recipient"
 exit 0