diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-03-05 19:30:21 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-03-07 08:02:22 +0900 |
| commit | 1086ea0cc24c74b464bc092c6ecc5166a928e3ce (patch) | |
| tree | ea5e5a6209ec2e5b82c32fcacf042365d59acdb8 /diff.c | |
| parent | diff-parseopt: convert --color-words (diff) | |
| download | tgif-1086ea0cc24c74b464bc092c6ecc5166a928e3ce.tar.xz | |
diff-parseopt: convert --exit-code
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -5297,6 +5297,8 @@ static void prep_parse_options(struct diff_options *options) N_("treat all files as text")), OPT_BOOL('R', NULL, &options->flags.reverse_diff, N_("swap two inputs, reverse the diff")), + OPT_BOOL(0, "exit-code", &options->flags.exit_with_status, + N_("exit with 1 if there were differences, 0 otherwise")), { OPTION_CALLBACK, 0, "output", options, N_("<file>"), N_("Output to a specific file"), PARSE_OPT_NONEG, NULL, 0, diff_opt_output }, @@ -5346,9 +5348,7 @@ int diff_opt_parse(struct diff_options *options, if (cm & COLOR_MOVED_WS_ERROR) return -1; options->color_moved_ws_handling = cm; - } else if (!strcmp(arg, "--exit-code")) - options->flags.exit_with_status = 1; - else if (!strcmp(arg, "--quiet")) + } else if (!strcmp(arg, "--quiet")) options->flags.quick = 1; else if (!strcmp(arg, "--ext-diff")) options->flags.allow_external = 1; |