Add -a option to get-tag-script to annotate but not sign a tag
PATCH 1/1 Add -a option to get-tag-script to annotate but not sign a tag
Add -a option to get-tag-script to annotate but not sign a tag
Also fix the test for an existing tag.
Signed-off-by A Large Angry SCM <[email protected]>
---
git-tag-script | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-)
a49029e5cf9cca0c2999c0241e75789bcc38dbb5
git-tag-script +15 -6
@@ -3,11 +3,15 @@ . git-sh-setup-script || die "Not a git archive" +annotate= signed= force= while case "$#" in 0) break ;; esac do case "$1" in + -a) + annotate=1 + ;; -s) signed=1 ;;
@@ -23,15 +27,16 @@ done name="$1" [ "$name" ] || die "I need a tag-name" -[ -e "$GIT_DIR/refs/tags/$name" ] && - [ "$force" ] || die "tag '$name' already exists" +if [ -e "$GIT_DIR/refs/tags/$name" -a -z "$force" ]; then + die "tag '$name' already exists" +fi shift object=$(git-rev-parse --verify --revs-only --default HEAD "$@") || exit 1 type=$(git-cat-file -t $object) || exit 1 tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1 -if [ "$signed" ]; then +if [ "$annotate" -o "$signed" ]; then ( echo "#" echo "# Write a tag message" echo "#" ) > .editmsg
@@ -42,10 +47,14 @@ if [ "$signed" ]; then [ -s .tagmsg ] || exit ( echo -e "object $object\ntype $type\ntag $name\ntagger $tagger\n"; cat .tagmsg ) > .tmp-tag - rm -f .tmp-tag.asc .tagmsg - gpg -bsa .tmp-tag && cat .tmp-tag.asc >> .tmp-tag + rm -f .tagmsg + if [ "$signed" ]; then + rm -f .tmp-tag.asc + gpg -bsa .tmp-tag && cat .tmp-tag.asc >> .tmp-tag + rm -f .tmp-tag.sig + fi object=$(git-mktag < .tmp-tag) - rm -f .tmp-tag .tmp-tag.sig + rm -f .tmp-tag fi mkdir -p "$GIT_DIR/refs/tags"