diff-parseopt: convert --patch-with-stat

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

Nguyễn Thái Ngọc Duy committed Feb 21, 2019 at 18:16 UTC e550f585518221bc6e946be2c3ce634dd71df3c1
1 file changed +5 -4
diff.c
+5 -4
@@ -4921,6 +4921,10 @@ static void prep_parse_options(struct diff_options *options)
4921 N_("synonym for '-p --raw'"),
4922 DIFF_FORMAT_PATCH | DIFF_FORMAT_RAW,
4923 DIFF_FORMAT_NO_OUTPUT),
4924 + OPT_BITOP(0, "patch-with-stat", &options->output_format,
4925 + N_("synonym for '-p --stat'"),
4926 + DIFF_FORMAT_PATCH | DIFF_FORMAT_DIFFSTAT,
4927 + DIFF_FORMAT_NO_OUTPUT),
4928 OPT_BIT_F(0, "numstat", &options->output_format,
4929 N_("machine friendly --stat"),
4930 DIFF_FORMAT_NUMSTAT, PARSE_OPT_NONEG),
@@ -4973,10 +4977,7 @@ int diff_opt_parse(struct diff_options *options,
4977 return ac;
4978
4979 /* Output format options */
4976 - if (!strcmp(arg, "--patch-with-stat")) {
4977 - enable_patch_output(&options->output_format);
4978 - options->output_format |= DIFF_FORMAT_DIFFSTAT;
4979 - } else if (!strcmp(arg, "--name-only"))
4980 + if (!strcmp(arg, "--name-only"))
4981 options->output_format |= DIFF_FORMAT_NAME;
4982 else if (!strcmp(arg, "--name-status"))
4983 options->output_format |= DIFF_FORMAT_NAME_STATUS;