Correct usages of sed in git-tag for Mac OS X

Both `git-tag -l` and `git tag -v` fail on Mac OS X due to their
non-standard uses of sed.  Actually `git tag -v` fails because the
underlying git-tag-verify uses a non-standard sed command.

We now stick to only standard sed, which does make our sed scripts
slightly more complicated, but we can actually list tags with more
than 0 lines of additional context and we can verify signed tags
with gpg.  These major Git functions are much more important than
saving two or three lines of a simple sed script.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-tag.sh

@@ -51,12 +51,16 @@ do
 		[ "$LINES" -le 0 ] && { echo "$TAG"; continue ;}
 		OBJTYPE=$(git cat-file -t "$TAG")
 		case $OBJTYPE in
-		tag)	ANNOTATION=$(git cat-file tag "$TAG" |
+		tag)
-				       sed -e '1,/^$/d' \
+			ANNOTATION=$(git cat-file tag "$TAG" |
-					   -e '/^-----BEGIN PGP SIGNATURE-----$/Q' )
+				sed -e '1,/^$/d' |
-			printf "%-15s %s\n" "$TAG" "$ANNOTATION" |
+				sed -n -e "
-			  sed -e '2,$s/^/    /' \
+					/^-----BEGIN PGP SIGNATURE-----\$/q
-			      -e "${LINES}q"
+					2,\$s/^/    /
+					p
+					${LINES}q
+				")
+			printf "%-15s %s\n" "$TAG" "$ANNOTATION"
 			;;
 		*)      echo "$TAG"
 			;;

git-verify-tag.sh

@@ -37,8 +37,9 @@ esac
 trap 'rm -f "$GIT_DIR/.tmp-vtag"' 0
 
 git-cat-file tag "$1" >"$GIT_DIR/.tmp-vtag" || exit 1
-
+sed -n -e '
-cat "$GIT_DIR/.tmp-vtag" |
+	/^-----BEGIN PGP SIGNATURE-----$/q
-sed '/-----BEGIN PGP/Q' |
+	p
+' <"$GIT_DIR/.tmp-vtag" |
 gpg --verify "$GIT_DIR/.tmp-vtag" - || exit 1
 rm -f "$GIT_DIR/.tmp-vtag"