"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 3a6467d..114c684 100644 (file)
--- 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)