diff-parseopt: convert --name-status

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index 7ea308814f7afa8a45cde9f1f53576815f2a2ded..99047fb5fec8d0aa9f00658c45bc8f93edd3bac7 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4952,6 +4952,9 @@ static void prep_parse_options(struct diff_options *options)
                OPT_BIT_F(0, "name-only", &options->output_format,
                          N_("show only names of changed files"),
                          DIFF_FORMAT_NAME, PARSE_OPT_NONEG),
                OPT_BIT_F(0, "name-only", &options->output_format,
                          N_("show only names of changed files"),
                          DIFF_FORMAT_NAME, PARSE_OPT_NONEG),

+               OPT_BIT_F(0, "name-status", &options->output_format,
+                         N_("show only names and status of changed files"),
+                         DIFF_FORMAT_NAME_STATUS, PARSE_OPT_NONEG),

                OPT_END()
        };
 
                OPT_END()
        };
 


@@ -4980,9 +4983,7 @@ int diff_opt_parse(struct diff_options *options,
                return ac;
 
        /* Output format options */
                return ac;
 
        /* Output format options */

-       if (!strcmp(arg, "--name-status"))
-               options->output_format |= DIFF_FORMAT_NAME_STATUS;
-       else if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch"))
+       if (!strcmp(arg, "-s") || !strcmp(arg, "--no-patch"))

                options->output_format |= DIFF_FORMAT_NO_OUTPUT;
        else if (starts_with(arg, "--stat"))
                /* --stat, --stat-width, --stat-name-width, or --stat-count */
                options->output_format |= DIFF_FORMAT_NO_OUTPUT;
        else if (starts_with(arg, "--stat"))
                /* --stat, --stat-width, --stat-name-width, or --stat-count */