X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=git-tag.sh;h=a0afa25821b5438f41abfed3a2f27bd22767c3d6;hp=bd9275367405fa0b8c10a2e1394195cdbcfc632c;hb=74237d6236d7e32f69469ff26df3f3bb3875f523;hpb=72e5890b68e7199d92620d3bba91fa36dd259404 diff --git a/git-tag.sh b/git-tag.sh index bd927536..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,7 +73,7 @@ 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 "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0 @@ -81,7 +95,8 @@ if [ "$annotate" ]; then exit 1 } - ( echo -e "object $object\ntype $type\ntag $name\ntagger $tagger\n"; + ( 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 @@ -92,5 +107,6 @@ if [ "$annotate" ]; then 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"