diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-01-04 14:50:44 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-01-04 15:02:40 -0800 |
| commit | 4d8c51aa19be94bddb7cac6b11bccb4d23dfd4f8 (patch) | |
| tree | 0faa3959b05341e99a8c77038c70304c6797a1ad | |
| parent | diff: properly error out when combining multiple pickaxe options (diff) | |
| download | tgif-4d8c51aa19be94bddb7cac6b11bccb4d23dfd4f8.tar.xz | |
diff: use HAS_MULTI_BITS instead of counting bits manually
This aligns the style to the previous patch.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | diff.c | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -4107,20 +4107,15 @@ void diff_setup(struct diff_options *options) void diff_setup_done(struct diff_options *options) { - int count = 0; + unsigned check_mask = DIFF_FORMAT_NAME | + DIFF_FORMAT_NAME_STATUS | + DIFF_FORMAT_CHECKDIFF | + DIFF_FORMAT_NO_OUTPUT; if (options->set_default) options->set_default(options); - if (options->output_format & DIFF_FORMAT_NAME) - count++; - if (options->output_format & DIFF_FORMAT_NAME_STATUS) - count++; - if (options->output_format & DIFF_FORMAT_CHECKDIFF) - count++; - if (options->output_format & DIFF_FORMAT_NO_OUTPUT) - count++; - if (count > 1) + if (HAS_MULTI_BITS(options->output_format & check_mask)) die(_("--name-only, --name-status, --check and -s are mutually exclusive")); if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)) |