X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=templates%2Fhooks--update;h=3f38b82a4710400e512d478ec6b552202a34369f;hb=26349b2e5ee2311cbb12db1cb92fa48fb0f26ef8;hp=540ade0d52c84d59bbdd863f60a0e90203643ff2;hpb=d59a6043a8a7aed97c684fb4f14fe5221df1fcaf;p=git.git

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