[PATCH 19/76] diff.c: convert --check
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2019-01-17 13:08:10
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- diff.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c
index 1cb410ed3a..07b495b686 100644
--- a/diff.c
+++ b/diff.c@@ -4937,6 +4937,9 @@ static void prep_parse_options(struct diff_options *options) N_("synonym for --dirstat=files,param1,param2..."), PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_dirstat), + OPT_BIT_F(0, "check", &options->output_format, + N_("warn if changes introduce conflict markers or whitespace errors"), + DIFF_FORMAT_CHECKDIFF, PARSE_OPT_NONEG), OPT_END() };
@@ -4965,9 +4968,7 @@ int diff_opt_parse(struct diff_options *options, return ac; /* Output format options */ - if (!strcmp(arg, "--check")) - options->output_format |= DIFF_FORMAT_CHECKDIFF; - else if (!strcmp(arg, "--summary")) + if (!strcmp(arg, "--summary")) options->output_format |= DIFF_FORMAT_SUMMARY; else if (!strcmp(arg, "--patch-with-stat")) { enable_patch_output(&options->output_format);
--
2.20.0.482.g66447595a7