diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-02-21 18:16:04 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-21 15:16:58 -0800 |
| commit | fc6af3e92afb24fd657c1381a8aab475b033b15a (patch) | |
| tree | 175101c8e9c7eada8449a08ed80988adf89aa85f /diff.c | |
| parent | 4ce7aab5a56394914bd05b9e5fa4ca66404ec5f5 (diff) | |
| download | git-fc6af3e92afb24fd657c1381a8aab475b033b15a.tar.gz | |
diff-parseopt: convert --check
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 | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -4939,6 +4939,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() }; @@ -4967,9 +4970,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); |