From: Nguyễn Thái Ngọc Duy Date: Thu, 17 Jan 2019 13:05:52 GMT Subject: [PATCH 53/76] diff.c: convert --ext-diff Message-ID: <20190117130615.18732-54-pclouds@gmail.com> In-Reply-To: <20190117130615.18732-1-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index eb81a95e89..78b5d93fa5 100644 --- a/diff.c +++ b/diff.c @@ -5305,6 +5305,8 @@ static void prep_parse_options(struct diff_options *options) N_("exit with 1 if there were differences, 0 otherwise")), OPT_BOOL(0, "quiet", &options->flags.quick, N_("disable all output of the program")), + OPT_BOOL(0, "ext-diff", &options->flags.allow_external, + N_("allow an external diff helper to be executed")), { OPTION_CALLBACK, 0, "output", options, N_(""), N_("Output to a specific file"), PARSE_OPT_NONEG, NULL, 0, diff_opt_output }, @@ -5354,11 +5356,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, "--ext-diff")) - options->flags.allow_external = 1; - else if (!strcmp(arg, "--no-ext-diff")) - options->flags.allow_external = 0; - else if (!strcmp(arg, "--textconv")) { + } else if (!strcmp(arg, "--textconv")) { options->flags.allow_textconv = 1; options->flags.textconv_set_via_cmdline = 1; } else if (!strcmp(arg, "--no-textconv")) -- 2.20.0.482.g66447595a7