This adds -a (annotate only but not sign) option "A Large Angry
SCM" <[EMAIL PROTECTED]> sent to the list, after fixing up the
whitespace corruption in the patch, with some of my own fixes.
Namely, changes are:
* A new flag '-a' can be used to create an unsigned tag
object;
* The '-f' flag logic did not do the right thing;
* When creating a signed tag, we did not check for GPG failure
as we should;
* Try to use the key for the tagger identity when signing the
tag.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
git-tag-script | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
0fad0fdd4beadb2ff06af8d5a16d509cd8796ee4
diff --git a/git-tag-script b/git-tag-script
--- a/git-tag-script
+++ b/git-tag-script
@@ -3,17 +3,30 @@
. git-sh-setup-script || die "Not a git archive"
+usage () {
+ echo >&2 "Usage: git-tag-script [-a | -s] [-f] tagname"
+ exit 1
+}
+
+annotate=
signed=
force=
while case "$#" in 0) break ;; esac
do
case "$1" in
+ -a)
+ annotate=1
+ ;;
-s)
+ annotate=1
signed=1
;;
-f)
force=1
;;
+ -*)
+ usage
+ ;;
*)
break
;;
@@ -22,16 +35,19 @@ do
done
name="$1"
-[ "$name" ] || die "I need a tag-name"
-[ -e "$GIT_DIR/refs/tags/$name" ] &&
- [ "$force" ] || die "tag '$name' already exists"
+[ "$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 --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
+trap 'rm -f .tmp-tag* .tagmsg .editmsg' 0
+
+if [ "$annotate" ]; then
( echo "#"
echo "# Write a tag message"
echo "#" ) > .editmsg
@@ -43,9 +59,13 @@ if [ "$signed" ]; then
( 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
+ 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)
- rm -f .tmp-tag .tmp-tag.sig
fi
mkdir -p "$GIT_DIR/refs/tags"
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
