]> asedeno.scripts.mit.edu Git - git.git/blobdiff - git-tag.sh
Merge branch 'maint'
[git.git] / git-tag.sh
index ac269e3277d9b8c844e8c43b95695375dd829746..c84043902f9fcaf7c09846b9fd68986bd7fc5108 100755 (executable)
@@ -1,16 +1,19 @@
 #!/bin/sh
 # Copyright (c) 2005 Linus Torvalds
 
-USAGE='-l [<pattern>] | [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <tagname> [<head>]'
+USAGE='[-n [<num>]] -l [<pattern>] | [-a | -s | -u <key-id>] [-f | -d | -v] [-m <msg>] <tagname> [<head>]'
 SUBDIRECTORY_OK='Yes'
 . git-sh-setup
 
+message_given=
 annotate=
 signed=
 force=
 message=
 username=
 list=
+verify=
+LINES=0
 while case "$#" in 0) break ;; esac
 do
     case "$1" in
@@ -24,19 +27,61 @@ do
     -f)
        force=1
        ;;
-    -l)
-       case "$#" in
-       1)
-               set x . ;;
+    -n)
+        case $2 in
+       -*)     LINES=1         # no argument
+               ;;
+       *)      shift
+               LINES=$(expr "$1" : '\([0-9]*\)')
+               [ -z "$LINES" ] && LINES=1 # 1 line is default when -n is used
+               ;;
        esac
+       ;;
+    -l)
+       list=1
        shift
-       git rev-parse --symbolic --tags | sort | grep "$@"
-       exit $?
+       PATTERN="$1"    # select tags by shell pattern, not re
+       git rev-parse --symbolic --tags | sort |
+           while read TAG
+           do
+               case "$TAG" in
+               *$PATTERN*) ;;
+               *)          continue ;;
+               esac
+               [ "$LINES" -le 0 ] && { echo "$TAG"; continue ;}
+               OBJTYPE=$(git cat-file -t "$TAG")
+               case $OBJTYPE in
+               tag)    ANNOTATION=$(git cat-file tag "$TAG" |
+                                      sed -e '1,/^$/d' \
+                                          -e '/^-----BEGIN PGP SIGNATURE-----$/Q' )
+                       printf "%-15s %s\n" "$TAG" "$ANNOTATION" |
+                         sed -e '2,$s/^/    /' \
+                             -e "${LINES}q"
+                       ;;
+               *)      echo "$TAG"
+                       ;;
+               esac
+           done
        ;;
     -m)
-       annotate=1
+       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
@@ -45,12 +90,29 @@ do
        username="$1"
        ;;
     -d)
-       shift
+       shift
+       had_error=0
+       for tag
+       do
+               cur=$(git-show-ref --verify --hash -- "refs/tags/$tag") || {
+                       echo >&2 "Seriously, what tag are you talking about?"
+                       had_error=1
+                       continue
+               }
+               git-update-ref -m 'tag: delete' -d "refs/tags/$tag" "$cur" || {
+                       had_error=1
+                       continue
+               }
+               echo "Deleted tag $tag."
+       done
+       exit $had_error
+       ;;
+    -v)
+       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."
+       git-verify-tag -v "$tag"
        exit $?
        ;;
     -*)
@@ -63,6 +125,8 @@ do
     shift
 done
 
+[ -n "$list" ] && exit 0
+
 name="$1"
 [ "$name" ] || usage
 prev=0000000000000000000000000000000000000000
@@ -78,24 +142,27 @@ 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 "z$tagger" : 'z\(.*>\)')}
+
+test -n "$username" ||
+       username=$(git-repo-config user.signingkey) ||
+       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
         ${VISUAL:-${EDITOR:-vi}} "$GIT_DIR"/TAG_EDITMSG || exit
     else
-        echo "$message" >"$GIT_DIR"/TAG_EDITMSG
+        printf '%s\n' "$message" >"$GIT_DIR"/TAG_EDITMSG
     fi
 
     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
     }
@@ -113,4 +180,3 @@ if [ "$annotate" ]; then
 fi
 
 git update-ref "refs/tags/$name" "$object" "$prev"
-