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>

diff --git a/builtin/log.c b/builtin/log.c
index b36a01efc4eb92391d1a77ba521f90d3e2d0a9c9..853f5d0401f32b9e3dede14ad1f3e1e78b1dccdb 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1136,11 +1136,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
                die (_("unrecognized argument: %s"), argv[1]);
 
        if (rev.diffopt.output_format & DIFF_FORMAT_NAME)
                die (_("unrecognized argument: %s"), argv[1]);
 
        if (rev.diffopt.output_format & DIFF_FORMAT_NAME)

-               die("--name-only does not make sense");
+               die(_("--name-only does not make sense"));

        if (rev.diffopt.output_format & DIFF_FORMAT_NAME_STATUS)
        if (rev.diffopt.output_format & DIFF_FORMAT_NAME_STATUS)

-               die("--name-status does not make sense");
+               die(_("--name-status does not make sense"));

        if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
        if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)

-               die("--check does not make sense");
+               die(_("--check does not make sense"));

 
        if (!use_patch_format &&
                (!rev.diffopt.output_format ||
 
        if (!use_patch_format &&
                (!rev.diffopt.output_format ||

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 027c13d52cd701ba28e3c5e29c5431acfccdad73..a46d88828ba2244023a6b1980914fd539c807782 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -614,7 +614,7 @@ echo "fatal: --name-only does not make sense" > expect.name-only
 echo "fatal: --name-status does not make sense" > expect.name-status
 echo "fatal: --check does not make sense" > expect.check
 
 echo "fatal: --name-status does not make sense" > expect.name-status
 echo "fatal: --check does not make sense" > expect.check
 

-test_expect_success 'options no longer allowed for format-patch' '
+test_expect_success C_LOCALE_OUTPUT 'options no longer allowed for format-patch' '

        test_must_fail git format-patch --name-only 2> output &&
        test_cmp expect.name-only output &&
        test_must_fail git format-patch --name-status 2> output &&
        test_must_fail git format-patch --name-only 2> output &&
        test_cmp expect.name-only output &&
        test_must_fail git format-patch --name-status 2> output &&