diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-03-05 19:30:17 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-03-07 08:02:22 +0900 |
| commit | 8b81c26e5cfd139230d7f00660b9ed3586595545 (patch) | |
| tree | 27f178bfa255687a82493fd5fb0aa64e74fde2b9 /diff.c | |
| parent | diff-parseopt: convert --[no-]follow (diff) | |
| download | tgif-8b81c26e5cfd139230d7f00660b9ed3586595545.tar.xz | |
diff-parseopt: convert --[no-]color
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.c | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -5148,6 +5148,8 @@ static void prep_parse_options(struct diff_options *options) PARSE_OPT_NONEG | PARSE_OPT_NOARG, diff_opt_binary), OPT_BOOL(0, "full-index", &options->flags.full_index, N_("show full pre- and post-image object names on the \"index\" lines")), + OPT_COLOR_FLAG(0, "color", &options->use_color, + N_("show colored diff")), OPT_CALLBACK_F(0, "output-indicator-new", &options->output_indicators[OUTPUT_INDICATOR_NEW], N_("<char>"), @@ -5268,15 +5270,7 @@ int diff_opt_parse(struct diff_options *options, return ac; /* flags options */ - if (skip_to_optional_arg_default(arg, "--color", &arg, "always")) { - int value = git_config_colorbool(NULL, arg); - if (value < 0) - return error("option `color' expects \"always\", \"auto\", or \"never\""); - options->use_color = value; - } - else if (!strcmp(arg, "--no-color")) - options->use_color = 0; - else if (!strcmp(arg, "--color-moved")) { + if (!strcmp(arg, "--color-moved")) { if (diff_color_moved_default) options->color_moved = diff_color_moved_default; if (options->color_moved == COLOR_MOVED_NO) |