X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-tag.sh;h=4a0a7b660780b7c377ce80ac49dc99cea3e8137d;hb=40250af411f33afa0c39a5d461829b676453ce3b;hp=e1bfa82f1ea1213fad8ff8c4b6ad2b17e6ca1f7e;hpb=9def2138a17325c68961c3b1e6c967d33f28a4f1;p=git.git diff --git a/git-tag.sh b/git-tag.sh index e1bfa82f1..4a0a7b660 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 @@ -62,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 $? ;; -*) @@ -94,7 +112,10 @@ 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\(.*>\)')} + +test -n "$username" || + username=$(git-repo-config user.signingkey) || + username=$(expr "z$tagger" : 'z\(.*>\)') trap 'rm -f "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0