Re: [PATCH] worktree: add -z option for list subcommand

From: Jean-Noël Avila <jn.avila@free.fr>
Date: Feb 28, 2022, 09:47 UTC
Message-ID: <90fcd727-414f-fc1f-fab3-2cbce5790aa0@free.fr>
In-Reply-To: <pull.1164.git.1645801727732.gitgitgadget@gmail.com>

Le 25/02/2022 à 16:08, Phillip Wood via GitGitGadget a écrit :

Show 12 quoted lines

> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
>
> @@ -696,6 +702,8 @@ static int list(int ac, const char **av, const char *prefix)
>   		usage_with_options(worktree_usage, options);
>   	else if (verbose && porcelain)
>   		die(_("options '%s' and '%s' cannot be used together"), "--verbose", "--porcelain");
> +	else if (!line_terminator && !porcelain)
> +		die(_("'-z' requires '--porcelain'"));
>   	else {
>   		struct worktree **worktrees = get_worktrees();
>   		int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i;

Please better use

  die(_("the option '%s' requires '%s'"),  "-z", "--porcelain");

In order to make a no-op for translators.

Best regards,

JN