X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=templates%2Fhooks--update;h=8f6c4fea2429cef0da4748f8871ceaed94b432cc;hb=bb95e19c5f1e470d2efe1c0e4e04c291019e4b25;hp=e8c536fb616d9fe93fe50edf4bc862b58ad6af1b;hpb=72f627d2bc860c560e4ea4ee172982b1d38ceca8;p=git.git

diff --git a/templates/hooks--update b/templates/hooks--update
index e8c536fb6..8f6c4fea2 100644
--- a/templates/hooks--update
+++ b/templates/hooks--update
@@ -57,14 +57,14 @@ announcerecipients=$(git-repo-config hooks.announcelist)
 allowunannotated=$(git-repo-config --bool hooks.allowunannotated)
 
 # --- Check types
-newrev_type=$(git-cat-file -t "$newrev")
+newrev_type=$(git-cat-file -t $newrev)
 
 case "$refname","$newrev_type" in
 	refs/tags/*,commit)
 		# un-annotated tag
 		refname_type="tag"
 		short_refname=${refname##refs/tags/}
-		if [ $allowunannotated != "true" ]; then
+		if [ "$allowunannotated" != "true" ]; then
 			echo "*** The un-annotated tag, $short_refname is not allowed in this repository" >&2
 			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
 			exit 1
@@ -148,7 +148,7 @@ case "$refname_type" in
 			# This shows all log entries that are not already covered by
 			# another ref - i.e. commits that are now accessible from this
 			# ref that were previously not accessible
-			git-rev-parse --not --all | git-rev-list --stdin --pretty $newref
+			git log $newrev --not --all
 			echo $LOGEND
 		else
 			# oldrev is valid
@@ -165,7 +165,7 @@ case "$refname_type" in
 			baserev=$(git-merge-base $oldrev $newrev)
 
 			# Commit with a parent
-			for rev in $(git-rev-list $newrev ^$baserev)
+			for rev in $(git-rev-list $newrev --not $baserev --all)
 			do
 				revtype=$(git-cat-file -t "$rev")
 				echo "       via  $rev ($revtype)"
@@ -190,11 +190,11 @@ case "$refname_type" in
 			fi
 			echo ""
 			echo $LOGBEGIN
-			git-rev-list --pretty $newrev ^$baserev
+			git log $newrev --not $baserev --all
 			echo $LOGEND
 			echo ""
 			echo "Diffstat:"
-			git-diff-tree --no-color --stat -M -C --find-copies-harder $newrev ^$baserev
+			git-diff-tree --no-color --stat -M -C --find-copies-harder $baserev..$newrev
 		fi
 		;;
 	"annotated tag")
@@ -210,7 +210,7 @@ case "$refname_type" in
 		fi
 
 		# If this tag succeeds another, then show which tag it replaces
-		prevtag=$(git describe $newrev^ 2>/dev/null | sed 's/-g.*//')
+		prevtag=$(git describe --abbrev=0 $newrev^ 2>/dev/null)
 		if [ -n "$prevtag" ]; then
 			echo "  replaces  $prevtag"
 		fi