diff-parseopt: convert --numstat and --shortstat

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2019-02-16 18:36:36 +07:00
committed by Junio C Hamano
parent c659f30398
commit e56736203e

12
diff.c
View File

@ -4905,6 +4905,12 @@ static void prep_parse_options(struct diff_options *options)
N_("synonym for '-p --raw'"), N_("synonym for '-p --raw'"),
DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW, DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW,
DIFF_FORMAT_NO_OUTPUT), DIFF_FORMAT_NO_OUTPUT),
OPT_BIT_F(0, "numstat", &options->output_format,
N_("machine friendly --stat"),
DIFF_FORMAT_NUMSTAT, PARSE_OPT_NONEG),
OPT_BIT_F(0, "shortstat", &options->output_format,
N_("output only the last line of --stat"),
DIFF_FORMAT_SHORTSTAT, PARSE_OPT_NONEG),
OPT_END() OPT_END()
}; };
@ -4933,11 +4939,7 @@ int diff_opt_parse(struct diff_options *options,
return ac; return ac;
/* Output format options */ /* Output format options */
if (!strcmp(arg, "--numstat")) if (skip_prefix(arg, "-X", &arg) ||
options->output_format |= DIFF_FORMAT_NUMSTAT;
else if (!strcmp(arg, "--shortstat"))
options->output_format |= DIFF_FORMAT_SHORTSTAT;
else if (skip_prefix(arg, "-X", &arg) ||
skip_to_optional_arg(arg, "--dirstat", &arg)) skip_to_optional_arg(arg, "--dirstat", &arg))
return parse_dirstat_opt(options, arg); return parse_dirstat_opt(options, arg);
else if (!strcmp(arg, "--cumulative")) else if (!strcmp(arg, "--cumulative"))