X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-tag-script;h=4124f5494a033c1bfddfbcce3c3e3d7da38797a5;hb=71fb3de0eed70bba1c7e28c8a0a2968efc48b9f3;hp=ccc75dcfbdd70e738f088a43aec9dc2866e3923c;hpb=0fc65a4572625405ff6dd9d8c16d835f2b1ebd49;p=git.git

diff --git a/git-tag-script b/git-tag-script
index ccc75dcf..4124f549 100755
--- a/git-tag-script
+++ b/git-tag-script
@@ -1,8 +1,26 @@
 #!/bin/sh
-object=${2:-$(cat .git/HEAD)}
+# Copyright (c) 2005 Linus Torvalds
+
+. git-sh-setup-script || die "Not a git archive"
+name="$1"
+[ "$name" ] || die "I need a tag-name"
+
+object=${2:-$(cat "$GIT_DIR"/HEAD)}
 type=$(git-cat-file -t $object) || exit 1
-( echo -e "object $object\ntype $type\ntag $1\n"; cat ) > .tmp-tag
-rm -f .tmp-tag.asc
+tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
+
+( echo "#"
+  echo "# Write a tag message"
+  echo "#" ) > .editmsg
+${VISUAL:-${EDITOR:-vi}} .editmsg || exit
+
+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
 gpg -bsa .tmp-tag && cat .tmp-tag.asc >> .tmp-tag
-git-mktag < .tmp-tag
+mkdir -p "$GIT_DIR/refs/tags"
+git-mktag < .tmp-tag > "$GIT_DIR/refs/tags/$name"
 #rm .tmp-tag .tmp-tag.sig