[PATCH] Add -m <message> option to "git tag"

Allow users to create a tag message by passing message on command line
instead of requiring an $EDITOR session.

Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-tag-script b/git-tag-script
index 4917f99576ef91266a63a12899f16de6589ea226..d3074a8b3d84d878f568f8b04867e923e1628fe5 100755 (executable)
--- a/git-tag-script
+++ b/git-tag-script
@@ -4,13 +4,14 @@
 . git-sh-setup-script || die "Not a git archive"
 
 usage () {
 . git-sh-setup-script || die "Not a git archive"
 
 usage () {

-    echo >&2 "Usage: git-tag-script [-a | -s] [-f] tagname"
+    echo >&2 "Usage: git-tag-script [-a | -s] [-f] [-m "tag message"] tagname"

     exit 1
 }
 
 annotate=
 signed=
 force=
     exit 1
 }
 
 annotate=
 signed=
 force=

+message=

 while case "$#" in 0) break ;; esac
 do
     case "$1" in
 while case "$#" in 0) break ;; esac
 do
     case "$1" in


@@ -24,6 +25,11 @@ do
     -f)
        force=1
        ;;
     -f)
        force=1
        ;;

+    -m)
+       annotate=1
+       shift
+       message="$1"
+       ;;

     -*)
         usage
        ;;
     -*)
         usage
        ;;


@@ -48,10 +54,14 @@ tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
 trap 'rm -f .tmp-tag* .tagmsg .editmsg' 0
 
 if [ "$annotate" ]; then
 trap 'rm -f .tmp-tag* .tagmsg .editmsg' 0
 
 if [ "$annotate" ]; then

-    ( echo "#"
-      echo "# Write a tag message"
-      echo "#" ) > .editmsg
-    ${VISUAL:-${EDITOR:-vi}} .editmsg || exit
+    if [ -z "$message" ]; then
+        ( echo "#"
+          echo "# Write a tag message"
+          echo "#" ) > .editmsg
+        ${VISUAL:-${EDITOR:-vi}} .editmsg || exit
+    else
+        echo "$message" > .editmsg
+    fi

 
     grep -v '^#' < .editmsg | git-stripspace > .tagmsg
 
 
     grep -v '^#' < .editmsg | git-stripspace > .tagmsg