| Message ID | 20231206115215.94467-8-l.s.r@web.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 792b86283b13fb2e06b9e62c64fca51b879d0266 |
| Headers | show |
| Series | standardize incompatibility messages | expand |
diff --git a/builtin/worktree.c b/builtin/worktree.c index 036ceaa981..4ac1621541 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -815,8 +815,8 @@ static int add(int ac, const char **av, const char *prefix) die(_("options '%s' and '%s' cannot be used together"), "--orphan", "--no-checkout"); if (opts.orphan && ac == 2) - die(_("'%s' and '%s' cannot be used together"), "--orphan", - _("<commit-ish>")); + die(_("option '%s' and commit-ish cannot be used together"), + "--orphan"); if (lock_reason && !keep_locked) die(_("the option '%s' requires '%s'"), "--reason", "--lock"); if (lock_reason)
Use a single translatable string to report that the worktree add option --orphan is incompatible with a commit-ish instead of having the commit-ish in a separate translatable string. This reduces the number of strings to translate and gives translators the full context. A similar message is used in builtin/describe.c, but with the plural of commit-ish, and here we need the singular form. Signed-off-by: René Scharfe <l.s.r@web.de> --- builtin/worktree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.43.0