X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=templates%2Fhooks--update;h=6db555f6580ca0831cf285a62ab7354211168203;hb=36383a3df37116f6022b5a0f7331fb19337c4730;hp=540ade0d52c84d59bbdd863f60a0e90203643ff2;hpb=f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda;p=git.git

diff --git a/templates/hooks--update b/templates/hooks--update
index 540ade0d..6db555f6 100644
--- a/templates/hooks--update
+++ b/templates/hooks--update
@@ -1,21 +1,30 @@
 #!/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
 # (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 "$2"
+	git-rev-list --pretty "$3"
 else
-	echo "New commits:"
-	git-rev-list --pretty "$3" "^$2"
+	base=$(git-merge-base "$2" "$3")
+	case "$base" in
+	"$2")
+		echo "New commits:"
+		;;
+	*)
+		echo "Rebased ref, commits from common ancestor:"
+		;;
+	esac
+	git-rev-list --pretty "$3" "^$base"
 fi |
 mail -s "Changes to ref $1" "$recipient"
 exit 0