diff-parseopt: convert --patch-with-raw

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 4bc9df7362360651b5d871cc3cf8b653a42543d2..12e333c67f5105d5b91ba63d381584e9fc8274ec 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4901,6 +4901,10 @@ static void prep_parse_options(struct diff_options *options)
                OPT_BIT_F(0, "raw", &options->output_format,
                          N_("generate the diff in raw format"),
                          DIFF_FORMAT_RAW, PARSE_OPT_NONEG),
                OPT_BIT_F(0, "raw", &options->output_format,
                          N_("generate the diff in raw format"),
                          DIFF_FORMAT_RAW, PARSE_OPT_NONEG),

+               OPT_BITOP(0, "patch-with-raw", &options->output_format,
+                         N_("synonym for '-p --raw'"),
+                         DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW,
+                         DIFF_FORMAT_NO_OUTPUT),

                OPT_END()
        };
 
                OPT_END()
        };
 


@@ -4929,10 +4933,7 @@ int diff_opt_parse(struct diff_options *options,
                return ac;
 
        /* Output format options */
                return ac;
 
        /* Output format options */

-       if (!strcmp(arg, "--patch-with-raw")) {
-               enable_patch_output(&options->output_format);
-               options->output_format |= DIFF_FORMAT_RAW;
-       } else if (!strcmp(arg, "--numstat"))
+       if (!strcmp(arg, "--numstat"))

                options->output_format |= DIFF_FORMAT_NUMSTAT;
        else if (!strcmp(arg, "--shortstat"))
                options->output_format |= DIFF_FORMAT_SHORTSTAT;
                options->output_format |= DIFF_FORMAT_NUMSTAT;
        else if (!strcmp(arg, "--shortstat"))
                options->output_format |= DIFF_FORMAT_SHORTSTAT;