From: Junio C Hamano <gitster@pobox.com>
To: "Jean-Noël AVILA" <jn.avila@free.fr>
Cc: "Vasco Almeida" <vascomalmeida@sapo.pt>,
git@vger.kernel.org, "Jiang Xin" <worldhello.net@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH 1/6] i18n: commit: mark message for translation
Date: Wed, 21 Sep 2016 10:17:57 -0700 [thread overview]
Message-ID: <xmqqintp9np6.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1579845.fzuqLqrEJ8@cayenne> ("Jean-Noël AVILA"'s message of "Tue, 20 Sep 2016 21:04:27 +0200")
Jean-Noël AVILA <jn.avila@free.fr> writes:
> Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
> Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
> ---
>
> Instead of distillating change requests, I'd better do it by
> myself. Here is the reworked version of the patch.
>
It would have helped if you had an in-body header to retitle this
patch for 3/6, instead of leaving it as 1/6 for "commit" X-<.
Will tweak and fit it in. Thanks.
> diff.c | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/diff.c b/diff.c
> index c6da383..494f723 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -55,6 +55,11 @@ static char diff_colors[][COLOR_MAXLEN] = {
> GIT_COLOR_NORMAL, /* FUNCINFO */
> };
>
> +static NORETURN void die_want_option(const char *option_name)
> +{
> + die(_("option '%s' requires a value"), option_name);
> +}
> +
> static int parse_diff_color_slot(const char *var)
> {
> if (!strcasecmp(var, "context") || !strcasecmp(var, "plain"))
> @@ -3325,7 +3330,7 @@ void diff_setup_done(struct diff_options *options)
> if (options->output_format & DIFF_FORMAT_NO_OUTPUT)
> count++;
> if (count > 1)
> - die("--name-only, --name-status, --check and -s are mutually exclusive");
> + die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
>
> /*
> * Most of the time we can say "there are changes"
> @@ -3521,7 +3526,7 @@ static int stat_opt(struct diff_options *options, const char **av)
> if (*arg == '=')
> width = strtoul(arg + 1, &end, 10);
> else if (!*arg && !av[1])
> - die("Option '--stat-width' requires a value");
> + die_want_option("--stat-width");
> else if (!*arg) {
> width = strtoul(av[1], &end, 10);
> argcount = 2;
> @@ -3530,7 +3535,7 @@ static int stat_opt(struct diff_options *options, const char **av)
> if (*arg == '=')
> name_width = strtoul(arg + 1, &end, 10);
> else if (!*arg && !av[1])
> - die("Option '--stat-name-width' requires a value");
> + die_want_option("--stat-name-width");
> else if (!*arg) {
> name_width = strtoul(av[1], &end, 10);
> argcount = 2;
> @@ -3539,7 +3544,7 @@ static int stat_opt(struct diff_options *options, const char **av)
> if (*arg == '=')
> graph_width = strtoul(arg + 1, &end, 10);
> else if (!*arg && !av[1])
> - die("Option '--stat-graph-width' requires a value");
> + die_want_option("--stat-graph-width");
> else if (!*arg) {
> graph_width = strtoul(av[1], &end, 10);
> argcount = 2;
> @@ -3548,7 +3553,7 @@ static int stat_opt(struct diff_options *options, const char **av)
> if (*arg == '=')
> count = strtoul(arg + 1, &end, 10);
> else if (!*arg && !av[1])
> - die("Option '--stat-count' requires a value");
> + die_want_option("--stat-count");
> else if (!*arg) {
> count = strtoul(av[1], &end, 10);
> argcount = 2;
prev parent reply other threads:[~2016-09-21 17:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-19 13:08 [PATCH 1/6] i18n: commit: mark message for translation Vasco Almeida
2016-09-19 13:08 ` [PATCH 2/6] i18n: connect: mark die messages " Vasco Almeida
2016-09-19 13:08 ` [PATCH 3/6] i18n: diff: mark die errors " Vasco Almeida
2016-09-19 13:08 ` [PATCH 4/6] i18n: ident: mark hint " Vasco Almeida
2016-09-19 13:08 ` [PATCH 5/6] i18n: notes-merge: mark die messages " Vasco Almeida
2016-09-19 13:08 ` [PATCH 6/6] i18n: stash: mark " Vasco Almeida
2016-09-19 17:54 ` [PATCH 1/6] i18n: commit: mark message " Junio C Hamano
2016-09-19 20:34 ` Jean-Noël AVILA
2016-09-19 21:08 ` Junio C Hamano
2016-09-20 19:04 ` Jean-Noël AVILA
2016-09-21 17:17 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqintp9np6.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jn.avila@free.fr \
--cc=vascomalmeida@sapo.pt \
--cc=worldhello.net@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).