X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-tag.sh;h=ecb9100e4b3a7d1ce0227fde447f675376aaf29a;hb=e27e609bbf81271318d99f2643f378f3fde6c6c6;hp=bd9275367405fa0b8c10a2e1394195cdbcfc632c;hpb=72e5890b68e7199d92620d3bba91fa36dd259404;p=git.git diff --git a/git-tag.sh b/git-tag.sh index bd9275367..ecb9100e4 100755 --- a/git-tag.sh +++ b/git-tag.sh @@ -1,18 +1,18 @@ #!/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 | -v] [-m ] []' +SUBDIRECTORY_OK='Yes' +. git-sh-setup +message_given= annotate= signed= force= message= username= +list= +verify= while case "$#" in 0) break ;; esac do case "$1" in @@ -26,10 +26,34 @@ do -f) force=1 ;; + -l) + case "$#" in + 1) + set x . ;; + esac + shift + git rev-parse --symbolic --tags | sort | grep "$@" + exit $? + ;; -m) annotate=1 shift message="$1" + if test "$#" = "0"; then + die "error: option -m needs an argument" + else + message_given=1 + fi + ;; + -F) + annotate=1 + shift + if test "$#" = "0"; then + die "error: option -F needs an argument" + else + message="$(cat "$1")" + message_given=1 + fi ;; -u) annotate=1 @@ -37,6 +61,23 @@ do shift username="$1" ;; + -d) + 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." + exit $? + ;; + -v) + shift + tag_name="$1" + tag=$(git-show-ref --verify --hash -- "refs/tags/$tag_name") || + die "Seriously, what tag are you talking about?" + git-verify-tag -v "$tag" + exit $? + ;; -*) usage ;; @@ -49,8 +90,11 @@ done name="$1" [ "$name" ] || usage -if [ -e "$GIT_DIR/refs/tags/$name" -a -z "$force" ]; then - die "tag '$name' already exists" +prev=0000000000000000000000000000000000000000 +if git-show-ref --verify --quiet -- "refs/tags/$name" +then + test -n "$force" || die "tag '$name' already exists" + prev=`git rev-parse "refs/tags/$name"` fi shift git-check-ref-format "tags/$name" || @@ -59,12 +103,12 @@ 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 if [ "$annotate" ]; then - if [ -z "$message" ]; then + if [ -z "$message_given" ]; then ( echo "#" echo "# Write a tag message" echo "#" ) > "$GIT_DIR"/TAG_EDITMSG @@ -76,12 +120,13 @@ if [ "$annotate" ]; then grep -v '^#' <"$GIT_DIR"/TAG_EDITMSG | git-stripspace >"$GIT_DIR"/TAG_FINALMSG - [ -s "$GIT_DIR"/TAG_FINALMSG ] || { + [ -s "$GIT_DIR"/TAG_FINALMSG -o -n "$message_given" ] || { echo >&2 "No tag message?" 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 +137,5 @@ if [ "$annotate" ]; then object=$(git-mktag < "$GIT_DIR"/TAG_TMP) fi -mkdir -p "$GIT_DIR/refs/tags" -echo $object > "$GIT_DIR/refs/tags/$name" +git update-ref "refs/tags/$name" "$object" "$prev" +