summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-03-05 12:30:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-03-06 23:02:22 (GMT)
commit0cda1003b785f0ac36f8c2975f70fdb6ab450987 (patch)
treeaae051414d2e98e0813f7eb062dc05f6c8ec8a6c /diff.c
parent9bbaf1ce3447a06b3ba58ae1f70868bcd17b5b6a (diff)
downloadgit-0cda1003b785f0ac36f8c2975f70fdb6ab450987.zip
git-0cda1003b785f0ac36f8c2975f70fdb6ab450987.tar.gz
git-0cda1003b785f0ac36f8c2975f70fdb6ab450987.tar.bz2
diff-parseopt: convert --ext-diff
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/diff.c b/diff.c
index bd15269..b460fa0 100644
--- a/diff.c
+++ b/diff.c
@@ -5301,6 +5301,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_("<file>"),
N_("Output to a specific file"),
PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
@@ -5350,11 +5352,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"))