From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 Nov 2007 23:21:42 +0000 (-0800)
Subject: "git-tag -s" should create a signed annotated tag
X-Git-Tag: v1.5.4-rc0~120^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c1a41b9d04d81f1c64754c933ef596045cfb99aa;p=git-core%2Fgit.git

"git-tag -s" should create a signed annotated tag

The earlier patch 396865859918e9c7bf8ce74aae137c57da134610 (Make
builtin-tag.c use parse_options.) broke "git-tag -s".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-tag.c b/builtin-tag.c
index 3a6467d8e..114c684d2 100644
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -398,6 +398,9 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 
 	argc = parse_options(argc, argv, options, git_tag_usage, 0);
 
+	if (sign)
+		annotate = 1;
+
 	if (list)
 		return list_tags(list == no_pattern ? NULL : list, lines);
 	if (delete)