1
0
mirror of https://github.com/git/git synced 2024-07-05 00:58:49 +00:00

diff-parseopt: convert --summary

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-21 18:16:05 +07:00 committed by Junio C Hamano
parent fc6af3e92a
commit 70a304179a

7
diff.c
View File

@ -4942,6 +4942,9 @@ static void prep_parse_options(struct diff_options *options)
OPT_BIT_F(0, "check", &options->output_format, OPT_BIT_F(0, "check", &options->output_format,
N_("warn if changes introduce conflict markers or whitespace errors"), N_("warn if changes introduce conflict markers or whitespace errors"),
DIFF_FORMAT_CHECKDIFF, PARSE_OPT_NONEG), DIFF_FORMAT_CHECKDIFF, PARSE_OPT_NONEG),
OPT_BIT_F(0, "summary", &options->output_format,
N_("condensed summary such as creations, renames and mode changes"),
DIFF_FORMAT_SUMMARY, PARSE_OPT_NONEG),
OPT_END() OPT_END()
}; };
@ -4970,9 +4973,7 @@ int diff_opt_parse(struct diff_options *options,
return ac; return ac;
/* Output format options */ /* Output format options */
if (!strcmp(arg, "--summary")) if (!strcmp(arg, "--patch-with-stat")) {
options->output_format |= DIFF_FORMAT_SUMMARY;
else if (!strcmp(arg, "--patch-with-stat")) {
enable_patch_output(&options->output_format); enable_patch_output(&options->output_format);
options->output_format |= DIFF_FORMAT_DIFFSTAT; options->output_format |= DIFF_FORMAT_DIFFSTAT;
} else if (!strcmp(arg, "--name-only")) } else if (!strcmp(arg, "--name-only"))