Re: [PATCH 5/5] diff: properly error out when combining multiple pickaxe options

[Jacob Keller <jacob.keller@xxxxxxxxx>]

On Tue, Jan 2, 2018 at 4:46 PM, Stefan Beller <sbeller@xxxxxxxxxx> wrote:
>                 die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
> +       count = 0;
> +
> +       if (options->pickaxe_opts & DIFF_PICKAXE_KIND_S)
> +               count++;
> +       if (options->pickaxe_opts & DIFF_PICKAXE_KIND_G)
> +               count++;
> +       if (options->pickaxe_opts & DIFF_PICKAXE_KIND_OBJFIND)
> +               count++;
> +       if (count > 1)
> +               die(_("-G, -S, --find-object are mutually exclusive"));

Nit: I'd put an "and" in the sentence.