Jean-Noël AVILA <jn.avila@xxxxxxx> writes:
> Signed-off-by: Vasco Almeida <vascomalmeida@xxxxxxx>
> Signed-off-by: Jean-Noel Avila <jn.avila@xxxxxxx>
> ---
>
> 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;