diff options
| author | René Scharfe <l.s.r@web.de> | 2023-11-26 11:57:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-27 01:01:45 (GMT) |
| commit | 7854bf49604484a7276b96d312b9daf7d15c7b34 (patch) | |
| tree | f43a43e0e1a3d45951af84c20e5111041ac3b24e /revision.c | |
| parent | 564d0252ca632e0264ed670534a51d18a689ef5d (diff) | |
| download | git-7854bf49604484a7276b96d312b9daf7d15c7b34.zip git-7854bf49604484a7276b96d312b9daf7d15c7b34.tar.gz git-7854bf49604484a7276b96d312b9daf7d15c7b34.tar.bz2 | |
i18n: factorize even more 'incompatible options' messages
Continue the work of 12909b6b8a (i18n: turn "options are incompatible"
into "cannot be used together", 2022-01-05) and a699367bb8 (i18n:
factorize more 'incompatible options' messages, 2022-01-31) to use the
same parameterized error message for reporting incompatible command line
options. This reduces the number of strings to translate and makes the
UI slightly more consistent.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2384,8 +2384,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->left_right = 1; } else if (!strcmp(arg, "--left-only")) { if (revs->right_only) - die("--left-only is incompatible with --right-only" - " or --cherry"); + die(_("options '%s' and '%s' cannot be used together"), + "--left-only", "--right-only/--cherry"); revs->left_only = 1; } else if (!strcmp(arg, "--right-only")) { if (revs->left_only) |