summaryrefslogtreecommitdiff
path: root/builtin/rev-list.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/rev-list.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/rev-list.c')
-rw-r--r--builtin/rev-list.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index c1a3b0b..777558e 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -676,7 +676,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
if (revs.count &&
(revs.tag_objects || revs.tree_objects || revs.blob_objects) &&
(revs.left_right || revs.cherry_mark))
- die(_("marked counting is incompatible with --objects"));
+ die(_("marked counting and '%s' cannot be used together"), "--objects");
save_commit_buffer = (revs.verbose_header ||
revs.grep_filter.pattern_list ||