Andrew's git / gitweb.git / blobdiff
?
combine-diff: Honour -z option correctly.
[gitweb.git] / git-tag.sh
diff --git a/git-tag.sh b/git-tag.sh
index 6130904a94ddeffb15b1b10ded8336c67112c12e..76e51ed174c3f8e752d221374ec83b1f1db7fde5 100755 (executable)
--- 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 <key-id>] [-f] [-m <msg>] <tagname> [<head>]"
-    exit 1
-}
+USAGE='-l [<pattern>] | [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]'
+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,17 @@ do
     -f)
        force=1
        ;;
+    -l)
+        cd "$GIT_DIR/refs" &&
+       case "$#" in
+       1)
+               find tags -type f -print ;;
+       *)
+               shift
+               find tags -type f -print | grep "$@" ;;
+       esac
+       exit $?
+       ;;
     -m)
        annotate=1
        shift
@@ -37,6 +46,13 @@ do
        shift
        username="$1"
        ;;
+    -d)
+       shift
+       tag_name="$1"
+       rm "$GIT_DIR/refs/tags/$tag_name" && \
+               echo "Deleted tag $tag_name."
+       exit $?
+       ;;
     -*)
         usage
        ;;
@@ -81,7 +97,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