Merge branch 'mm/tag'

* mm/tag: Teach git-tag about showing tag annotations.
18 years ago · 6abd0fb396
2 changed files with 46 additions and 11 deletions
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git-tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]  <name> [<head>]
 'git-tag' -d <name>...
-'git-tag' -l [<pattern>]
+'git-tag' [-n [<num>]] -l [<pattern>]
 'git-tag' -v <name>
 DESCRIPTION
@ -38,8 +38,8 @@ GnuPG key for signing.
 `-v <tag>` verifies the gpg signature of the tag.
-`-l <pattern>` lists tags that match the given pattern (or all
+`-l <pattern>` lists tags with names that match the given pattern
-if no pattern is given).
+(or all if no pattern is given).
 OPTIONS
 -------
@ -61,8 +61,13 @@ OPTIONS
 -v::
 	Verify the gpg signature of given the tag
 -n <num>::
 	<num> specifies how many lines from the annotation, if any,
 	are printed when using -l.
 	The default is not to print any annotation lines.
 -l <pattern>::
-	List tags that match the given pattern (or all if no pattern is given).
+	List tags with names that match the given pattern (or all if no pattern is given).
 -m <msg>::
 	Use the given tag message (instead of prompting)
--- a/git-tag.sh
+++ b/git-tag.sh
@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (c) 2005 Linus Torvalds
-USAGE='-l [<pattern>] | [-a | -s | -u <key-id>] [-f | -d | -v] [-m <msg>] <tagname> [<head>]'
+USAGE='[-n [<num>]] -l [<pattern>] | [-a | -s | -u <key-id>] [-f | -d | -v] [-m <msg>] <tagname> [<head>]'
 SUBDIRECTORY_OK='Yes'
 . git-sh-setup
@ -13,6 +13,7 @@ message=
 username=
 list=
 verify=
 LINES=0
 while case "$#" in 0) break ;; esac
 do
    case "$1" in
@ -26,14 +27,41 @@ do
    -f)
 	force=1
 	;;
-    -l)
+    -n)
-	case "$#" in
+        case $2 in
-	1)
+	-*)	LINES=1 	# no argument
-		set x . ;;
+		;;
 	*)	shift
 		LINES=$(expr "$1" : '\([0-9]*\)')
 		[ -z "$LINES" ] && LINES=1 # 1 line is default when -n is used
 		;;
 	esac
 	;;
    -l)
 	list=1
 	shift
-	git rev-parse --symbolic --tags | sort | grep "$@"
+	PATTERN="$1"	# select tags by shell pattern, not re
-	exit $?
+	git rev-parse --symbolic --tags | sort |
 	    while read TAG
 	    do
 	        case "$TAG" in
 		*$PATTERN*) ;;
 		*)	    continue ;;
 		esac
 		[ "$LINES" -le 0 ] && { echo "$TAG"; continue ;}
 		OBJTYPE=$(git cat-file -t "$TAG")
 		case $OBJTYPE in
 		tag)	ANNOTATION=$(git cat-file tag "$TAG" |
 				       sed -e '1,/^$/d' \
 					   -e '/^-----BEGIN PGP SIGNATURE-----$/Q' )
 			printf "%-15s %s\n" "$TAG" "$ANNOTATION" |
 			  sed -e '2,$s/^/    /' \
 			      -e "${LINES}q"
 			;;
 		*)      echo "$TAG"
 			;;
 		esac
 	    done
 	;;
    -m)
    	annotate=1
@ -97,6 +125,8 @@ do
    shift
 done
 [ -n "$list" ] && exit 0
 name="$1"
 [ "$name" ] || usage
 prev=0000000000000000000000000000000000000000