[PATCH] builtin/tag.c: Add tag name to user message

[PATCH] builtin/tag.c: Add tag name to user message

[Thorsten Glaser]

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>
---
 builtin/tag.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/builtin/tag.c b/builtin/tag.c
index 6c7c6bd..8a7265b 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -278,11 +278,11 @@ static int do_sign(struct strbuf *buffer)
 }
 
 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[] =
-	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");
 
@@ -378,9 +378,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)
-				strbuf_commented_addf(&buf, _(tag_template), comment_line_char);
+				strbuf_commented_addf(&buf, _(tag_template), tag, comment_line_char);
 			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);
 		}
-- 
2.0.0.rc0

Re: [PATCH] builtin/tag.c: Add tag name to user message

[Junio C Hamano]

Thorsten Glaser <tg@debian.org> writes:

> 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>
> ---

Sounds sensible from a first glance.  Will queue; thanks.

>  builtin/tag.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/tag.c b/builtin/tag.c
> index 6c7c6bd..8a7265b 100644
> --- a/builtin/tag.c
> +++ b/builtin/tag.c
> @@ -278,11 +278,11 @@ static int do_sign(struct strbuf *buffer)
>  }
>  
>  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[] =
> -	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");
>  
> @@ -378,9 +378,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)
> -				strbuf_commented_addf(&buf, _(tag_template), comment_line_char);
> +				strbuf_commented_addf(&buf, _(tag_template), tag, comment_line_char);
>  			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);
>  		}