[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9e11554)
git-tag: support -F <file> option
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Thu, 21 Dec 2006 14:13:02 +0000 (15:13 +0100)
committerJunio C Hamano <junkio@cox.net>
Fri, 22 Dec 2006 06:44:04 +0000 (22:44 -0800)
This imitates the behaviour of git-commit.

Noticed by Han-Wen Nienhuys.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-tag.txt patch | blob | history
git-tag.sh patch | blob | history

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 45476c2e415112347372f034276dec367f7a6a8d..48b82b86f83df4e3fb381da329b48fe12a4ce82d 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -9,7 +9,8 @@ git-tag - Create a tag object signed with GPG
 SYNOPSIS
 --------
 [verse]
-'git-tag' [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <name> [<head>]
+'git-tag' [-a | -s | -u <key-id>] [-f | -d] [-m <msg> | -F <file>]
+        <name> [<head>]
 'git-tag' -l [<pattern>]
 
 DESCRIPTION
@@ -60,6 +61,9 @@ OPTIONS
 -m <msg>::
        Use the given tag message (instead of prompting)
 
+-F <file>::
+       Take the tag message from the given file.  Use '-' to
+       read the message from the standard input.
 
 Author
 ------
diff --git a/git-tag.sh b/git-tag.sh
index d53f94cd9c618e9c2032d3e6ad7af9f3866e7707..36cd6aa256db765aa741099b8d3c63b50f58048f 100755 (executable)
--- a/git-tag.sh
+++ b/git-tag.sh
@@ -45,6 +45,17 @@ do
            message_given=1
        fi
        ;;
+    -F)
+       annotate=1
+       shift
+       if test "$#" = "0"; then
+           die "error: option -F needs an argument"
+           exit 2
+       else
+           message="$(cat "$1")"
+           message_given=1
+       fi
+       ;;
     -u)
        annotate=1
        signed=1
Git - the stupid content tracker