git-branch -D: make it work even when on a yet-to-be-born branch

diff --git a/git-verify-tag.sh b/git-verify-tag.sh
index 156c75bb3e4fb0c46ed9bff67b3fb48d795b41fb..36f171b3028a3460c1c51f9c1f5747a9a0d2d850 100755 (executable)
--- a/git-verify-tag.sh
+++ b/git-verify-tag.sh
@@ -1,8 +1,42 @@
 #!/bin/sh
-. git-sh-setup || die "Not a git archive"
 
-tag=$(git-rev-parse $1) || exit 1
+USAGE='<tag>'
+SUBDIRECTORY_OK='Yes'
+. git-sh-setup
+
+verbose=
+while case $# in 0) break;; esac
+do
+       case "$1" in
+       -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
+               verbose=t ;;
+       *)
+               break ;;
+       esac
+       shift
+done
+
+if [ "$#" != "1" ]
+then
+       usage
+fi
+
+type="$(git-cat-file -t "$1" 2>/dev/null)" ||
+       die "$1: no such object."
+
+test "$type" = tag ||
+       die "$1: cannot verify a non-tag object of type $type."
+
+case "$verbose" in
+t)
+       git-cat-file -p "$1" |
+       sed -n -e '/^-----BEGIN PGP SIGNATURE-----/q' -e p
+       ;;
+esac
+
+git-cat-file tag "$1" >"$GIT_DIR/.tmp-vtag" || exit 1
+cat "$GIT_DIR/.tmp-vtag" |
+sed '/-----BEGIN PGP/Q' |
+gpg --verify "$GIT_DIR/.tmp-vtag" - || exit 1
+rm -f "$GIT_DIR/.tmp-vtag"
 
-git-cat-file tag $tag > .tmp-vtag || exit 1
-cat .tmp-vtag | sed '/-----BEGIN PGP/Q' | gpg --verify .tmp-vtag - || exit 1
-rm -f .tmp-vtag