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

From: Jacob Keller <jacob.keller@gmail.com>
Date: Jan 3, 2018, 00:58 UTC
Message-ID: <CA+P7+xr7W2sTtUBAhQDZXOTVypuiCU0fL+-W4tbVPd++QbUJcA@mail.gmail.com>
In-Reply-To: <20180103004624.222528-6-sbeller@google.com>

On Tue, Jan 2, 2018 at 4:46 PM, Stefan Beller <sbeller@google.com> wrote:

Show 11 quoted lines

>                 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.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.