summaryrefslogtreecommitdiff
path: root/builtin-tag.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-25 23:21:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-25 23:47:29 (GMT)
commitc1a41b9d04d81f1c64754c933ef596045cfb99aa (patch)
treef17d880825ba0c1ddaf527db506088c753a93ee9 /builtin-tag.c
parentbd46c9a91261f282546a1a41b5303b041fae1361 (diff)
downloadgit-c1a41b9d04d81f1c64754c933ef596045cfb99aa.zip
git-c1a41b9d04d81f1c64754c933ef596045cfb99aa.tar.gz
git-c1a41b9d04d81f1c64754c933ef596045cfb99aa.tar.bz2
"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>
Diffstat (limited to 'builtin-tag.c')
-rw-r--r--builtin-tag.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-tag.c b/builtin-tag.c
index 3a6467d..114c684 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)