builtin/tag.c: show tag name to hint in the message editor

Display the tag name about to be added to the user during interactive
editing.

Signed-off-by: Thorsten Glaser <tg@debian.org>
Signed-off-by: Richard Hartmann <richih@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/tag.c b/builtin/tag.c
index 74d3780b77548fc8a7bb2f51b47a51cbfb51969a..8f1a0c170c092be1c364fffe92469938cdf0703e 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -246,11 +246,11 @@ static int do_sign(struct strbuf *buffer)
 }
 
 static const char tag_template[] =
 }
 
 static const char tag_template[] =

-       N_("\nWrite a tag message\n"
+       N_("\nWrite a message for tag:\n  %s\n"

        "Lines starting with '%c' will be ignored.\n");
 
 static const char tag_template_nocleanup[] =
        "Lines starting with '%c' will be ignored.\n");
 
 static const char tag_template_nocleanup[] =

-       N_("\nWrite a tag message\n"
+       N_("\nWrite a message for tag:\n  %s\n"

        "Lines starting with '%c' will be kept; you may remove them"
        " yourself if you want to.\n");
 
        "Lines starting with '%c' will be kept; you may remove them"
        " yourself if you want to.\n");
 


@@ -346,9 +346,9 @@ static void create_tag(const unsigned char *object, const char *tag,
                        struct strbuf buf = STRBUF_INIT;
                        strbuf_addch(&buf, '\n');
                        if (opt->cleanup_mode == CLEANUP_ALL)
                        struct strbuf buf = STRBUF_INIT;
                        strbuf_addch(&buf, '\n');
                        if (opt->cleanup_mode == CLEANUP_ALL)

-                               strbuf_commented_addf(&buf, _(tag_template), comment_line_char);
+                               strbuf_commented_addf(&buf, _(tag_template), tag, comment_line_char);

                        else
                        else

-                               strbuf_commented_addf(&buf, _(tag_template_nocleanup), comment_line_char);
+                               strbuf_commented_addf(&buf, _(tag_template_nocleanup), tag, comment_line_char);

                        write_or_die(fd, buf.buf, buf.len);
                        strbuf_release(&buf);
                }
                        write_or_die(fd, buf.buf, buf.len);
                        strbuf_release(&buf);
                }