Document the --(no-)edit switch of git-revert and git-cherry-pick

[git.git] / git-tag.sh
diff --git a/git-tag.sh b/git-tag.sh

index bd92753..2435a75 100755 (executable)
--- a/git-tag.sh
+++ b/git-tag.sh
@@ -1,10 +1,15 @@
  #!/bin/sh
  # Copyright (c) 2005 Linus Torvalds
  
-. git-sh-setup || die "Not a git archive"
+GIT_DIR=`git-rev-parse --git-dir` || exit $?
  
  usage () {
-    echo >&2 "Usage: git-tag [-a | -s | -u <key-id>] [-f] [-m <msg>] <tagname> [<head>]"
+    echo >&2 "Usage: git-tag [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]"
+    exit 1
+}
+
+die () {
+    echo >&2 "$*"
      exit 1
  }
  
@@ -37,6 +42,13 @@ do
         shift
         username="$1"
         ;;
+    -d)
+       shift
+       tag_name="$1"
+       rm "$GIT_DIR/refs/tags/$tag_name" && \
+               echo "Deleted tag $tag_name."
+       exit $?
+       ;;
      -*)
          usage
         ;;
@@ -92,5 +104,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"