i18n: git-log "--OPT does not make sense" messages
Gettextize the "--name-only/--name-status/--check does not make sense" messages. A test in t4014-format-patch.sh explicitly checked for these messages. Change them to skip under GETTEXT_POISON=YesPlease. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:41 UTC
f338cb83a0328b9fe4ec37dff0d4dcc3b8f3cde9
2 files changed
+4
-4
builtin/log.c
+3
-3
@@ -1136,11 +1136,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
1136
die (_("unrecognized argument: %s"), argv[1]);
1137
1138
if (rev.diffopt.output_format & DIFF_FORMAT_NAME)
1139
- die("--name-only does not make sense");
1139
+ die(_("--name-only does not make sense"));
1140
if (rev.diffopt.output_format & DIFF_FORMAT_NAME_STATUS)
1141
- die("--name-status does not make sense");
1141
+ die(_("--name-status does not make sense"));
1142
if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
1143
- die("--check does not make sense");
1143
+ die(_("--check does not make sense"));
1144
1145
if (!use_patch_format &&
1146
(!rev.diffopt.output_format ||
t/t4014-format-patch.sh
+1
-1
@@ -614,7 +614,7 @@ echo "fatal: --name-only does not make sense" > expect.name-only
614
echo "fatal: --name-status does not make sense" > expect.name-status
615
echo "fatal: --check does not make sense" > expect.check
616
617
-test_expect_success 'options no longer allowed for format-patch' '
617
+test_expect_success C_LOCALE_OUTPUT 'options no longer allowed for format-patch' '
618
test_must_fail git format-patch --name-only 2> output &&
619
test_cmp expect.name-only output &&
620
test_must_fail git format-patch --name-status 2> output &&