Andrew's git / gitweb.git / blobdiff
?
git-commit -s: no extra space when sign-offs appear at the end already.
[gitweb.git] / git-tag.sh
diff --git a/git-tag.sh b/git-tag.sh
index ac269e3277d9b8c844e8c43b95695375dd829746..988bf4c6a6b52af4d4a1b792090c317b9d799755 100755 (executable)
--- a/git-tag.sh
+++ b/git-tag.sh
@@ -1,16 +1,18 @@
 #!/bin/sh
 # Copyright (c) 2005 Linus Torvalds
 
-USAGE='-l [<pattern>] | [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]'
+USAGE='-l [<pattern>] | [-a | -s | -u <key-id>] [-f | -d | -v] [-m <msg>] <tagname> [<head>]'
 SUBDIRECTORY_OK='Yes'
 . git-sh-setup
 
+message_given=
 annotate=
 signed=
 force=
 message=
 username=
 list=
+verify=
 while case "$#" in 0) break ;; esac
 do
     case "$1" in
@@ -37,6 +39,21 @@ do
        annotate=1
        shift
        message="$1"
+       if test "$#" = "0"; then
+           die "error: option -m needs an argument"
+       else
+           message_given=1
+       fi
+       ;;
+    -F)
+       annotate=1
+       shift
+       if test "$#" = "0"; then
+           die "error: option -F needs an argument"
+       else
+           message="$(cat "$1")"
+           message_given=1
+       fi
        ;;
     -u)
        annotate=1
@@ -46,11 +63,28 @@ do
        ;;
     -d)
        shift
+       had_error=0
+       for tag
+       do
+               cur=$(git-show-ref --verify --hash -- "refs/tags/$tag") || {
+                       echo >&2 "Seriously, what tag are you talking about?"
+                       had_error=1
+                       continue
+               }
+               git-update-ref -m 'tag: delete' -d "refs/tags/$tag" "$cur" || {
+                       had_error=1
+                       continue
+               }
+               echo "Deleted tag $tag."
+       done
+       exit $had_error
+       ;;
+    -v)
+       shift
        tag_name="$1"
        tag=$(git-show-ref --verify --hash -- "refs/tags/$tag_name") ||
                die "Seriously, what tag are you talking about?"
-       git-update-ref -m 'tag: delete' -d "refs/tags/$tag_name" "$tag" &&
-               echo "Deleted tag $tag_name."
+       git-verify-tag -v "$tag"
        exit $?
        ;;
     -*)
@@ -78,12 +112,14 @@ git-check-ref-format "tags/$name" ||
 object=$(git-rev-parse --verify --default HEAD "$@") || exit 1
 type=$(git-cat-file -t $object) || exit 1
 tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
-: ${username:=$(expr "z$tagger" : 'z\(.*>\)')}
+
+keyid=$(git-repo-config user.signingkey) ||
+       keyid=$(expr "z$tagger" : 'z\(.*>\)')
 
 trap 'rm -f "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0
 
 if [ "$annotate" ]; then
-    if [ -z "$message" ]; then
+    if [ -z "$message_given" ]; then
         ( echo "#"
           echo "# Write a tag message"
           echo "#" ) > "$GIT_DIR"/TAG_EDITMSG
@@ -95,7 +131,7 @@ if [ "$annotate" ]; then
     grep -v '^#' <"$GIT_DIR"/TAG_EDITMSG |
     git-stripspace >"$GIT_DIR"/TAG_FINALMSG
 
-    [ -s "$GIT_DIR"/TAG_FINALMSG ] || {
+    [ -s "$GIT_DIR"/TAG_FINALMSG -o -n "$message_given" ] || {
        echo >&2 "No tag message?"
        exit 1
     }
@@ -105,7 +141,7 @@ if [ "$annotate" ]; then
       cat "$GIT_DIR"/TAG_FINALMSG ) >"$GIT_DIR"/TAG_TMP
     rm -f "$GIT_DIR"/TAG_TMP.asc "$GIT_DIR"/TAG_FINALMSG
     if [ "$signed" ]; then
-       gpg -bsa -u "$username" "$GIT_DIR"/TAG_TMP &&
+       gpg -bsa -u "$keyid" "$GIT_DIR"/TAG_TMP &&
        cat "$GIT_DIR"/TAG_TMP.asc >>"$GIT_DIR"/TAG_TMP ||
        die "failed to sign the tag with GPG."
     fi