[PATCH v3 06/21] diff-parseopt: convert --patch-with-stat

[Nguyễn Thái Ngọc Duy]

Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
 diff.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/diff.c b/diff.c
index 0276f25200..b9811aefef 100644
--- a/diff.c
+++ b/diff.c
@@ -4921,6 +4921,10 @@ static void prep_parse_options(struct diff_options 
*options)
                          N_("synonym for '-p --raw'"),
                          DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW,
                          DIFF_FORMAT_NO_OUTPUT),
+               OPT_BITOP(0, "patch-with-stat", &options->output_format,
+                         N_("synonym for '-p --stat'"),
+                         DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT,
+                         DIFF_FORMAT_NO_OUTPUT),
                OPT_BIT_F(0, "numstat", &options->output_format,
                          N_("machine friendly --stat"),
                          DIFF_FORMAT_NUMSTAT, PARSE_OPT_NONEG),
@@ -4973,10 +4977,7 @@ int diff_opt_parse(struct diff_options *options,
                return ac;
 
        /* Output format options */
-       if (!strcmp(arg, "--patch-with-stat")) {
-               enable_patch_output(&options->output_format);
-               options->output_format |= DIFF_FORMAT_DIFFSTAT;
-       } else if (!strcmp(arg, "--name-only"))
+       if (!strcmp(arg, "--name-only"))
                options->output_format |= DIFF_FORMAT_NAME;
        else if (!strcmp(arg, "--name-status"))
                options->output_format |= DIFF_FORMAT_NAME_STATUS;
-- 
2.21.0.rc0.328.g0e39304f8d