Re: [PATCH v4 02/11] i18n: refactor "%s, %s and %s are mutually exclusive"

From: Johannes Sixt <j6t@kdbg.org>
Date: Jan 3, 2022, 15:44 UTC
Message-ID: <0f7e3f12-9869-db9f-db27-0d13862a4233@kdbg.org>
In-Reply-To: <e307ea9b998f77d9b2e3c3ce37a510a9e5686949.1641143746.git.gitgitgadget@gmail.com>

Am 02.01.22 um 18:15 schrieb Jean-Noël Avila via GitGitGadget:

Show 10 quoted lines

> diff --git a/builtin/worktree.c b/builtin/worktree.c
> index 9a520485769..27b60732a22 100644
> --- a/builtin/worktree.c
> +++ b/builtin/worktree.c
> @@ -503,7 +503,7 @@ static int add(int ac, const char **av, const char *prefix)
>  	opts.checkout = 1;
>  	ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
>  	if (!!opts.detach + !!new_branch + !!new_branch_force > 1)
> -		die(_("-b, -B, and --detach are mutually exclusive"));
> +		die(_("options '%s', '%s', and '%s' cannot be used together"),"-b", "-B", "--detach");

As the range-diff in the coverletter shows, you fixed the missing blank after the comma in a lot of cases. This one slipped through. Not worth a re-roll on its own, IMO.

-- Hannes