Andrew's git / gitweb.git / diff
?
diff-parseopt: convert --ita-[in]visible-in-index
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Sun, 24 Mar 2019 08:19:56 +0000 (15:19 +0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Mar 2019 13:21:21 +0000 (22:21 +0900)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c patch | blob | history
diff --git a/diff.c b/diff.c
index 7bfdf081378c2460c1f36616f25bed557d1ab012..8255db69667777667efb69f6896294253e53f0b2 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -5352,6 +5352,12 @@ static void prep_parse_options(struct diff_options *options)
                               N_("specify how differences in submodules are shown"),
                               PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
                               diff_opt_submodule),
                               N_("specify how differences in submodules are shown"),
                               PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
                               diff_opt_submodule),
+               OPT_SET_INT_F(0, "ita-invisible-in-index", &options->ita_invisible_in_index,
+                             N_("hide 'git add -N' entries from the index"),
+                             1, PARSE_OPT_NONEG),
+               OPT_SET_INT_F(0, "ita-visible-in-index", &options->ita_invisible_in_index,
+                             N_("treat 'git add -N' entries as real in the index"),
+                             0, PARSE_OPT_NONEG),
                { OPTION_CALLBACK, 0, "output", options, N_("<file>"),
                  N_("Output to a specific file"),
                  PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
                { OPTION_CALLBACK, 0, "output", options, N_("<file>"),
                  N_("Output to a specific file"),
                  PARSE_OPT_NONEG, NULL, 0, diff_opt_output },
@@ -5401,10 +5407,7 @@ int diff_opt_parse(struct diff_options *options,
                if (cm & COLOR_MOVED_WS_ERROR)
                        return -1;
                options->color_moved_ws_handling = cm;
                if (cm & COLOR_MOVED_WS_ERROR)
                        return -1;
                options->color_moved_ws_handling = cm;
-       } else if (!strcmp(arg, "--ita-invisible-in-index"))
-               options->ita_invisible_in_index = 1;
-       else if (!strcmp(arg, "--ita-visible-in-index"))
-               options->ita_invisible_in_index = 0;
+       }
 
        /* misc options */
        else if (!strcmp(arg, "-z"))
 
        /* misc options */
        else if (!strcmp(arg, "-z"))