| Message ID | 20190305123026.7266-17-pclouds@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | nd/diff-parseopt part 3 | expand |
On Tue, Mar 5, 2019 at 7:32 AM Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote: > diff --git a/diff.c b/diff.c > @@ -5299,6 +5299,8 @@ static void prep_parse_options(struct diff_options *options) > + OPT_BOOL(0, "quiet", &options->flags.quick, > + N_("disable all output of the program")), As a reviewer, I was wondering why you didn't use OPT__QUIET() here, but... > @@ -5348,9 +5350,7 @@ int diff_opt_parse(struct diff_options *options, > - } else if (!strcmp(arg, "--quiet")) > - options->flags.quick = 1; > - else if (!strcmp(arg, "--ext-diff")) I guess the reason is that flags.quick isn't necessarily about verbosity/quietness.
On Tue, Mar 5, 2019 at 10:42 PM Eric Sunshine <sunshine@sunshineco.com> wrote: > > On Tue, Mar 5, 2019 at 7:32 AM Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote: > > diff --git a/diff.c b/diff.c > > @@ -5299,6 +5299,8 @@ static void prep_parse_options(struct diff_options *options) > > + OPT_BOOL(0, "quiet", &options->flags.quick, > > + N_("disable all output of the program")), > > As a reviewer, I was wondering why you didn't use OPT__QUIET() here, but... It probably just didn't occur to me. After doing a couple conversions, you kinda get in a routine and forget to question if your choice is the right one. > > @@ -5348,9 +5350,7 @@ int diff_opt_parse(struct diff_options *options, > > - } else if (!strcmp(arg, "--quiet")) > > - options->flags.quick = 1; > > - else if (!strcmp(arg, "--ext-diff")) > > I guess the reason is that flags.quick isn't necessarily about > verbosity/quietness. Also OPT__QUIET() adds the short option -q. Adding that, even if helpful, should be done separately.
diff --git a/diff.c b/diff.c index 3f80e06de5..bd15269346 100644 --- a/diff.c +++ b/diff.c @@ -5299,6 +5299,8 @@ static void prep_parse_options(struct diff_options *options) N_("swap two inputs, reverse the diff")), OPT_BOOL(0, "exit-code", &options->flags.exit_with_status, 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>"), N_("Output to a specific file"), 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) return -1; options->color_moved_ws_handling = cm; - } else if (!strcmp(arg, "--quiet")) - options->flags.quick = 1; - else if (!strcmp(arg, "--ext-diff")) + } else if (!strcmp(arg, "--ext-diff")) options->flags.allow_external = 1; else if (!strcmp(arg, "--no-ext-diff")) options->flags.allow_external = 0;
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- diff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)