From 0bc72abdb0440f003169211f01b8f3ffb83291e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santi=20B=C3=A9jar?= Date: Wed, 3 Jan 2007 13:59:00 +0100 Subject: git-tag: add flag to verify a tag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way "git tag -v $tag" is the UI for git-verify-tag. Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano --- Documentation/git-tag.txt | 7 ++++++- generate-cmdlist.sh | 1 - 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 ] [-f | -d] [-m | -F ] +'git-tag' [-a | -s | -u ] [-f | -d | -v] [-m | -F ] [] 'git-tag' -l [] @@ -35,6 +35,8 @@ GnuPG key for signing. `-d ` deletes the tag. +`-v ` verifies the gpg signature of the tag. + `-l ` 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 :: 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 [] | [-a | -s | -u ] [-f | -d] [-m ] []' +USAGE='-l [] | [-a | -s | -u ] [-f | -d | -v] [-m ] []' 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 ;; -- cgit v1.2.3