{"thread":{"id":"36595","subject":"[PATCH] builtin/tag.c: Add tag name to user message","startedAt":"2013-08-29T22:03:10Z","lastAt":"2014-05-07T21:24:51Z","messageCount":2,"participants":["Thorsten Glaser","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"240876","messageId":"201405070749.s477nvCL000897@herc.mirbsd.org","threadId":"36595","inReplyTo":null,"subject":"[PATCH] builtin/tag.c: Add tag name to user message","fromName":"Thorsten Glaser","fromEmail":"tg@debian.org","sentAt":"2013-08-29T22:03:10Z","receivedAt":"2013-08-29T22:03:10Z","isPatch":true,"sender":{"key":"tg@debian.org","avatar":"https://avatars.githubusercontent.com/u/861078?v=4"},"body":"Display the tag name about to be added to the user during interactive\nediting.\n\nSigned-off-by: Thorsten Glaser <tg@debian.org>\nSigned-off-by: Richard Hartmann <richih@debian.org>\n---\n builtin/tag.c | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin/tag.c b/builtin/tag.c\nindex 6c7c6bd..8a7265b 100644\n--- a/builtin/tag.c\n+++ b/builtin/tag.c\n@@ -278,11 +278,11 @@ static int do_sign(struct strbuf *buffer)\n }\n \n static const char tag_template[] =\n-\tN_(\"\\nWrite a tag message\\n\"\n+\tN_(\"\\nWrite a message for tag:\\n  %s\\n\"\n \t\"Lines starting with '%c' will be ignored.\\n\");\n \n static const char tag_template_nocleanup[] =\n-\tN_(\"\\nWrite a tag message\\n\"\n+\tN_(\"\\nWrite a message for tag:\\n  %s\\n\"\n \t\"Lines starting with '%c' will be kept; you may remove them\"\n \t\" yourself if you want to.\\n\");\n \n@@ -378,9 +378,9 @@ static void create_tag(const unsigned char *object, const char *tag,\n \t\t\tstruct strbuf buf = STRBUF_INIT;\n \t\t\tstrbuf_addch(&buf, '\\n');\n \t\t\tif (opt->cleanup_mode == CLEANUP_ALL)\n-\t\t\t\tstrbuf_commented_addf(&buf, _(tag_template), comment_line_char);\n+\t\t\t\tstrbuf_commented_addf(&buf, _(tag_template), tag, comment_line_char);\n \t\t\telse\n-\t\t\t\tstrbuf_commented_addf(&buf, _(tag_template_nocleanup), comment_line_char);\n+\t\t\t\tstrbuf_commented_addf(&buf, _(tag_template_nocleanup), tag, comment_line_char);\n \t\t\twrite_or_die(fd, buf.buf, buf.len);\n \t\t\tstrbuf_release(&buf);\n \t\t}\n-- \n2.0.0.rc0\n"},{"id":"240967","messageId":"xmqqy4yd704c.fsf@gitster.dls.corp.google.com","threadId":"36595","inReplyTo":"201405070749.s477nvCL000897@herc.mirbsd.org","subject":"Re: [PATCH] builtin/tag.c: Add tag name to user message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-05-07T21:24:51Z","receivedAt":"2014-05-07T21:24:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thorsten Glaser <tg@debian.org> writes:\n\n> Display the tag name about to be added to the user during interactive\n> editing.\n>\n> Signed-off-by: Thorsten Glaser <tg@debian.org>\n> Signed-off-by: Richard Hartmann <richih@debian.org>\n> ---\n\nSounds sensible from a first glance.  Will queue; thanks.\n\n>  builtin/tag.c | 8 ++++----\n>  1 file changed, 4 insertions(+), 4 deletions(-)\n>\n> diff --git a/builtin/tag.c b/builtin/tag.c\n> index 6c7c6bd..8a7265b 100644\n> --- a/builtin/tag.c\n> +++ b/builtin/tag.c\n> @@ -278,11 +278,11 @@ static int do_sign(struct strbuf *buffer)\n>  }\n>  \n>  static const char tag_template[] =\n> -\tN_(\"\\nWrite a tag message\\n\"\n> +\tN_(\"\\nWrite a message for tag:\\n  %s\\n\"\n>  \t\"Lines starting with '%c' will be ignored.\\n\");\n>  \n>  static const char tag_template_nocleanup[] =\n> -\tN_(\"\\nWrite a tag message\\n\"\n> +\tN_(\"\\nWrite a message for tag:\\n  %s\\n\"\n>  \t\"Lines starting with '%c' will be kept; you may remove them\"\n>  \t\" yourself if you want to.\\n\");\n>  \n> @@ -378,9 +378,9 @@ static void create_tag(const unsigned char *object, const char *tag,\n>  \t\t\tstruct strbuf buf = STRBUF_INIT;\n>  \t\t\tstrbuf_addch(&buf, '\\n');\n>  \t\t\tif (opt->cleanup_mode == CLEANUP_ALL)\n> -\t\t\t\tstrbuf_commented_addf(&buf, _(tag_template), comment_line_char);\n> +\t\t\t\tstrbuf_commented_addf(&buf, _(tag_template), tag, comment_line_char);\n>  \t\t\telse\n> -\t\t\t\tstrbuf_commented_addf(&buf, _(tag_template_nocleanup), comment_line_char);\n> +\t\t\t\tstrbuf_commented_addf(&buf, _(tag_template_nocleanup), tag, comment_line_char);\n>  \t\t\twrite_or_die(fd, buf.buf, buf.len);\n>  \t\t\tstrbuf_release(&buf);\n>  \t\t}\n"}]}