From: Junio C Hamano <junkio@cox.net>
Date: Sat, 3 Mar 2007 00:57:53 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~103
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4808bec6f9b5fe414f0dbc2cc0445f54f28e9e9c?hp=-c

Merge branch 'maint'

* maint:
Fix quoting in update hook template
---

4808bec6f9b5fe414f0dbc2cc0445f54f28e9e9c
diff --combined templates/hooks--update
index 4af2fe8d95,555bd5f532..5b82b68e93
--- a/templates/hooks--update
+++ b/templates/hooks--update
@@@ -57,14 -57,14 +57,14 @@@ announcerecipients=$(git-repo-config ho
  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 +148,7 @@@ case "$refname_type" i
  			# 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 +165,7 @@@
  			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 +190,11 @@@
  			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")