diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-02-16 18:36:35 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-02-20 12:32:53 -0800 |
| commit | c659f30398fecdc3dbea1faeaf41e94c30d5da6f (patch) | |
| tree | e8ec0baece2d289286ba65e703fabe1be650a8ab | |
| parent | diff.c: convert --raw (diff) | |
| download | tgif-c659f30398fecdc3dbea1faeaf41e94c30d5da6f.tar.xz | |
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>
| -rw-r--r-- | diff.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -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_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() }; @@ -4929,10 +4933,7 @@ int diff_opt_parse(struct diff_options *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; |