summaryrefslogtreecommitdiff
path: root/builtin/clone.c
diff options
context:
space:
mode:
authorJean-Noël Avila <jn.avila@free.fr>2022-01-05 20:02:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-01-05 21:31:00 (GMT)
commit246cac85055f513626159e8cd20b741eaf5f9f97 (patch)
treee6d7e00c0918636199eb430e98ecc62e8980ded7 /builtin/clone.c
parentd7d30badbf1ece9c944e41bac4d8aef1117e8b7f (diff)
downloadgit-246cac85055f513626159e8cd20b741eaf5f9f97.zip
git-246cac85055f513626159e8cd20b741eaf5f9f97.tar.gz
git-246cac85055f513626159e8cd20b741eaf5f9f97.tar.bz2
i18n: turn even more messages into "cannot be used together" ones
Even if some of these messages are not subject to gettext i18n, this helps bring a single style of message for a given error type. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Reviewed-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/clone.c')
-rw-r--r--builtin/clone.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/clone.c b/builtin/clone.c
index 13bdbe1..8b79666 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -900,8 +900,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (option_bare) {
if (option_origin)
- die(_("--bare and --origin %s options are incompatible."),
- option_origin);
+ die(_("options '%s' and '%s %s' cannot be used together"),
+ "--bare", "--origin", option_origin);
if (real_git_dir)
die(_("options '%s' and '%s' cannot be used together"), "--bare", "--separate-git-dir");
option_no_checkout = 1;