Merge branch 'maint'

[git.git] / git-tag.sh
diff --git a/git-tag.sh b/git-tag.sh

index d53f94cd9c618e9c2032d3e6ad7af9f3866e7707..ecb9100e4b3a7d1ce0227fde447f675376aaf29a 100755 (executable)
--- a/git-tag.sh
+++ b/git-tag.sh
@@ -1,7 +1,7 @@
  #!/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
  
@@ -12,6 +12,7 @@ force=
  message=
  username=
  list=
+verify=
  while case "$#" in 0) break ;; esac
  do
      case "$1" in
@@ -40,11 +41,20 @@ do
         message="$1"
         if test "$#" = "0"; then
             die "error: option -m needs an argument"
-           exit 2
         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
         signed=1
@@ -60,6 +70,14 @@ do
                 echo "Deleted tag $tag_name."
         exit $?
         ;;
+    -v)
+       shift
+       tag_name="$1"
+       tag=$(git-show-ref --verify --hash -- "refs/tags/$tag_name") ||
+               die "Seriously, what tag are you talking about?"
+       git-verify-tag -v "$tag"
+       exit $?
+       ;;
      -*)
          usage
         ;;