From d727782eaf85d7bbf49e666776deadd3fee85715 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 23 Jul 2005 15:21:22 -0700
Subject: [PATCH] Make "git tag" create both simple and signed tags

A simple tag is just a direct pointer to the object, while a signed tag
is a pointer to a "tag object" that has a pgp signature and points to
the object we tagged.

Use "git tag -s tagname" to create a signed tag.

The "-f" flag overwrites any previous tag of that name (useful if you
update a tag to point to a newer version for things like "latest" etc
tags that aren't necessarily static versions).
---
 git-tag-script | 78 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 26 deletions(-)
 rewrite git-tag-script (63%)

diff --git a/git-tag-script b/git-tag-script
dissimilarity index 63%
index 4124f5494a..c375a840d3 100755
--- a/git-tag-script
+++ b/git-tag-script
@@ -1,26 +1,52 @@
-#!/bin/sh
-# 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
-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
-mkdir -p "$GIT_DIR/refs/tags"
-git-mktag < .tmp-tag > "$GIT_DIR/refs/tags/$name"
-#rm .tmp-tag .tmp-tag.sig
+#!/bin/sh
+# Copyright (c) 2005 Linus Torvalds
+
+. git-sh-setup-script || die "Not a git archive"
+
+signed=
+force=
+while case "$#" in 0) break ;; esac
+do
+    case "$1" in
+    -s)
+	signed=1
+	;;
+    -f)
+	force=1
+	;;
+    *)
+	break
+	;;
+    esac
+    shift
+done
+
+name="$1"
+[ "$name" ] || die "I need a tag-name"
+[ -e "$GIT_DIR/refs/tags/$name" ] &&
+	[ "$force" ] || die "tag '$name' already exists"
+shift
+
+object=$(git-rev-parse --verify --revs-only --default HEAD "$@") || exit 1
+type=$(git-cat-file -t $object) || exit 1
+tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
+
+if [ "$signed" ]; then
+    ( 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
+    object=$(git-mktag < .tmp-tag)
+    rm -f .tmp-tag .tmp-tag.sig
+fi
+
+mkdir -p "$GIT_DIR/refs/tags"
+echo $object > "$GIT_DIR/refs/tags/$name"
-- 
2.11.4.GIT