X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-tag.sh;h=a0afa25821b5438f41abfed3a2f27bd22767c3d6;hb=1a82e79315ed633f6b0b1fc4076054950c5380d3;hp=faa766799df6d276b6fcdca79d4f05b05ec2626b;hpb=e634aec752642dcf86c3fc82025e43381d6768c2;p=git.git diff --git a/git-tag.sh b/git-tag.sh index faa76679..a0afa258 100755 --- a/git-tag.sh +++ b/git-tag.sh @@ -1,18 +1,16 @@ #!/bin/sh # Copyright (c) 2005 Linus Torvalds -. git-sh-setup || die "Not a git archive" - -usage () { - echo >&2 "Usage: git-tag [-a | -s | -u ] [-f] [-m ] []" - exit 1 -} +USAGE='-l [] | [-a | -s | -u ] [-f | -d] [-m ] []' +SUBDIRECTORY_OK='Yes' +. git-sh-setup annotate= signed= force= message= username= +list= while case "$#" in 0) break ;; esac do case "$1" in @@ -26,6 +24,15 @@ do -f) force=1 ;; + -l) + case "$#" in + 1) + set x . ;; + esac + shift + git rev-parse --symbolic --tags | sort | grep "$@" + exit $? + ;; -m) annotate=1 shift @@ -37,6 +44,13 @@ do shift username="$1" ;; + -d) + shift + tag_name="$1" + rm "$GIT_DIR/refs/tags/$tag_name" && \ + echo "Deleted tag $tag_name." + exit $? + ;; -*) usage ;; @@ -59,36 +73,40 @@ 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 "$tagger" : '\(.*>\)')} +: ${username:=$(expr "z$tagger" : 'z\(.*>\)')} -trap 'rm -f .tmp-tag* .tagmsg .editmsg' 0 +trap 'rm -f "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0 if [ "$annotate" ]; then if [ -z "$message" ]; then ( echo "#" echo "# Write a tag message" - echo "#" ) > .editmsg - ${VISUAL:-${EDITOR:-vi}} .editmsg || exit + echo "#" ) > "$GIT_DIR"/TAG_EDITMSG + ${VISUAL:-${EDITOR:-vi}} "$GIT_DIR"/TAG_EDITMSG || exit else - echo "$message" > .editmsg + echo "$message" >"$GIT_DIR"/TAG_EDITMSG fi - grep -v '^#' < .editmsg | git-stripspace > .tagmsg + grep -v '^#' <"$GIT_DIR"/TAG_EDITMSG | + git-stripspace >"$GIT_DIR"/TAG_FINALMSG - [ -s .tagmsg ] || { + [ -s "$GIT_DIR"/TAG_FINALMSG ] || { echo >&2 "No tag message?" exit 1 } - ( echo -e "object $object\ntype $type\ntag $name\ntagger $tagger\n"; cat .tagmsg ) > .tmp-tag - rm -f .tmp-tag.asc .tagmsg + ( printf 'object %s\ntype %s\ntag %s\ntagger %s\n\n' \ + "$object" "$type" "$name" "$tagger"; + cat "$GIT_DIR"/TAG_FINALMSG ) >"$GIT_DIR"/TAG_TMP + rm -f "$GIT_DIR"/TAG_TMP.asc "$GIT_DIR"/TAG_FINALMSG if [ "$signed" ]; then - gpg -bsa -u "$username" .tmp-tag && - cat .tmp-tag.asc >>.tmp-tag || + gpg -bsa -u "$username" "$GIT_DIR"/TAG_TMP && + cat "$GIT_DIR"/TAG_TMP.asc >>"$GIT_DIR"/TAG_TMP || die "failed to sign the tag with GPG." fi - object=$(git-mktag < .tmp-tag) + object=$(git-mktag < "$GIT_DIR"/TAG_TMP) fi -mkdir -p "$GIT_DIR/refs/tags" +leading=`expr "refs/tags/$name" : '\(.*\)/'` && +mkdir -p "$GIT_DIR/$leading" && echo $object > "$GIT_DIR/refs/tags/$name"