kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff-parseopt: convert --quiet 

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2019-03-05 19:30:22 +07:00 committed by Junio C Hamano
parent 1086ea0cc2
commit 9bbaf1ce34
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -5299,6 +5299,8 @@ static void prep_parse_options(struct diff_options *options)
N_("swap two inputs, reverse the diff")), N_("swap two inputs, reverse the diff")),
OPT_BOOL(0, "exit-code", &options->flags.exit_with_status, OPT_BOOL(0, "exit-code", &options->flags.exit_with_status,
N_("exit with 1 if there were differences, 0 otherwise")), N_("exit with 1 if there were differences, 0 otherwise")),
OPT_BOOL(0, "quiet", &options->flags.quick,
N_("disable all output of the program")),
{ OPTION_CALLBACK, 0, "output", options, N_("<file>"), { OPTION_CALLBACK, 0, "output", options, N_("<file>"),
N_("Output to a specific file"), N_("Output to a specific file"),
PARSE_OPT_NONEG, NULL, 0, diff_opt_output }, PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
@ -5348,9 +5350,7 @@ int diff_opt_parse(struct diff_options *options,
if (cm & COLOR_MOVED_WS_ERROR) if (cm & COLOR_MOVED_WS_ERROR)
return -1; return -1;
options->color_moved_ws_handling = cm; options->color_moved_ws_handling = cm;
} else if (!strcmp(arg, "--quiet")) } else if (!strcmp(arg, "--ext-diff"))
options->flags.quick = 1;
else if (!strcmp(arg, "--ext-diff"))
options->flags.allow_external = 1; options->flags.allow_external = 1;
else if (!strcmp(arg, "--no-ext-diff")) else if (!strcmp(arg, "--no-ext-diff"))
options->flags.allow_external = 0; options->flags.allow_external = 0;