X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-tag-script;h=39c3c53987bf647d2b15127c7fa8cedcc5befd35;hb=b5dca4bbd97dc43e34c1361a32c212298508102c;hp=ccc75dcfbdd70e738f088a43aec9dc2866e3923c;hpb=0fc65a4572625405ff6dd9d8c16d835f2b1ebd49;p=git.git

diff --git a/git-tag-script b/git-tag-script
index ccc75dcf..39c3c539 100755
--- a/git-tag-script
+++ b/git-tag-script
@@ -1,8 +1,82 @@
 #!/bin/sh
-object=${2:-$(cat .git/HEAD)}
+# Copyright (c) 2005 Linus Torvalds
+
+. git-sh-setup-script || die "Not a git archive"
+
+usage () {
+    echo >&2 "Usage: git-tag-script [-a | -s] [-f] [-m "tag message"] tagname"
+    exit 1
+}
+
+annotate=
+signed=
+force=
+message=
+while case "$#" in 0) break ;; esac
+do
+    case "$1" in
+    -a)
+	annotate=1
+	;;
+    -s)
+	annotate=1
+	signed=1
+	;;
+    -f)
+	force=1
+	;;
+    -m)
+    	annotate=1
+	shift
+	message="$1"
+	;;
+    -*)
+        usage
+	;;
+    *)
+	break
+	;;
+    esac
+    shift
+done
+
+name="$1"
+[ "$name" ] || usage
+if [ -e "$GIT_DIR/refs/tags/$name" -a -z "$force" ]; then
+    die "tag '$name' already exists"
+fi
+shift
+
+object=$(git-rev-parse --verify --default HEAD "$@") || exit 1
 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
-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"