Merge three separate "fetch refs" functions

diff --git a/git-tag-script b/git-tag-script
index 281d192814ec200199379f44fef10d2b04f762c1..4124f5494a033c1bfddfbcce3c3e3d7da38797a5 100755 (executable)
--- a/git-tag-script
+++ b/git-tag-script
@@ -1,12 +1,26 @@
 #!/bin/sh
 # Copyright (c) 2005 Linus Torvalds
 
-: ${GIT_DIR=.git}
+. 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