diff options
| -rw-r--r-- | Documentation/git-tag.txt | 7 | ||||
| -rwxr-xr-x | generate-cmdlist.sh | 1 | ||||
| -rwxr-xr-x | git-tag.sh | 11 |
3 files changed, 16 insertions, 3 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 48b82b86f8..80bece0775 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -9,7 +9,7 @@ git-tag - Create a tag object signed with GPG SYNOPSIS -------- [verse] -'git-tag' [-a | -s | -u <key-id>] [-f | -d] [-m <msg> | -F <file>] +'git-tag' [-a | -s | -u <key-id>] [-f | -d | -v] [-m <msg> | -F <file>] <name> [<head>] 'git-tag' -l [<pattern>] @@ -35,6 +35,8 @@ GnuPG key for signing. `-d <tag>` deletes the tag. +`-v <tag>` verifies the gpg signature of the tag. + `-l <pattern>` lists tags that match the given pattern (or all if no pattern is given). @@ -55,6 +57,9 @@ OPTIONS -d:: Delete an existing tag with the given name +-v:: + Verify the gpg signature of given the tag + -l <pattern>:: List tags that match the given pattern (or all if no pattern is given). diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh index 06c42b042d..1de14ea82f 100755 --- a/generate-cmdlist.sh +++ b/generate-cmdlist.sh @@ -37,7 +37,6 @@ show show-branch status tag -verify-tag EOF while read cmd do diff --git a/git-tag.sh b/git-tag.sh index e1bfa82f1e..ecb9100e4b 100755 --- 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 @@ -69,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 ;; |