-( echo -e "object $object\ntype $type\ntag $1\n"; cat ) > .tmp-tag
-rm -f .tmp-tag.asc
-gpg -bsa .tmp-tag && cat .tmp-tag.asc >> .tmp-tag
-git-mktag < .tmp-tag
-#rm .tmp-tag .tmp-tag.sig
+tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
+
+trap 'rm -f .tmp-tag* .tagmsg .editmsg' 0
+
+if [ "$annotate" ]; then
+ if [ -z "$message" ]; then
+ ( echo "#"
+ echo "# Write a tag message"
+ echo "#" ) > .editmsg
+ ${VISUAL:-${EDITOR:-vi}} .editmsg || exit
+ else
+ echo "$message" > .editmsg
+ fi
+
+ grep -v '^#' < .editmsg | git-stripspace > .tagmsg
+
+ [ -s .tagmsg ] || exit
+
+ ( echo -e "object $object\ntype $type\ntag $name\ntagger $tagger\n"; cat .tagmsg ) > .tmp-tag
+ rm -f .tmp-tag.asc .tagmsg
+ if [ "$signed" ]; then
+ me=$(expr "$tagger" : '\(.*>\)') &&
+ gpg -bsa -u "$me" .tmp-tag &&
+ cat .tmp-tag.asc >>.tmp-tag ||
+ die "failed to sign the tag with GPG."
+ fi
+ object=$(git-mktag < .tmp-tag)
+fi
+
+mkdir -p "$GIT_DIR/refs/tags"
+echo $object > "$GIT_DIR/refs/tags/$name"