public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox•com>
To: Thorsten Glaser <tg@debian•org>
Cc: git@vger•kernel.org, Richard Hartmann <richih@debian•org>
Subject: Re: [PATCH] builtin/tag.c: Add tag name to user message
Date: Wed, 07 May 2014 14:24:51 -0700	[thread overview]
Message-ID: <xmqqy4yd704c.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <201405070749.s477nvCL000897@herc.mirbsd.org> (Thorsten Glaser's message of "Fri, 30 Aug 2013 00:03:10 +0200")

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);
>  		}

      reply	other threads:[~2014-05-07 21:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-29 22:03 [PATCH] builtin/tag.c: Add tag name to user message Thorsten Glaser
2014-05-07 21:24 ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqy4yd704c.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=richih@debian$(echo .)org \
    --cc=tg@debian$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox