summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-12-21 15:13:02 +0100
committerJunio C Hamano <junkio@cox.net>2006-12-21 22:44:04 -0800
commitf79c73ce9ce5d8bd1b4abaf3fc384aa8daa169ef (patch)
tree11eb5596425275e075df0226524ceb633edfa295
parent9e11554917d391c18e043bc0b38ee0377e69568e (diff)
downloadgit-f79c73ce9ce5d8bd1b4abaf3fc384aa8daa169ef.tar.gz
git-tag: support -F <file> option
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>
-rw-r--r--Documentation/git-tag.txt6
-rwxr-xr-xgit-tag.sh11
2 files changed, 16 insertions, 1 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 45476c2e41..48b82b86f8 100644
--- 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 d53f94cd9c..36cd6aa256 100755
--- 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