gettextize: git-merge "Updating %s..%s" message

Gettextize the "Updating %s..%s\n" message. A test in
t1200-tutorial.sh explicitly checked for this message. Split it into
two tests to skip the test_cmp test under GETTEXT_POISON=YesPlease.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

diff --git a/builtin/merge.c b/builtin/merge.c
index 70b60ae13bb2a9c1d5cc4abd69fcb18e2fcdd3b4..0571ab38daab75a34307be4d47c4a57080772239 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1086,7 +1086,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                strcpy(hex, find_unique_abbrev(head, DEFAULT_ABBREV));
 
                if (verbosity >= 0)
-                       printf("Updating %s..%s\n",
+                       printf(_("Updating %s..%s\n"),
                                hex,
                                find_unique_abbrev(remoteheads->item->object.sha1,
                                DEFAULT_ABBREV));

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index ab55eda158bb5a6ecad77302aa2fe17bd6e92be3..c9b59843b6ec1aee55ed0789405227763e316928 100755 (executable)
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -163,7 +163,10 @@ test_expect_success 'git resolve' '
        git checkout mybranch &&
        git merge -m "Merge upstream changes." master |
                sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
-               -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output &&
+               -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output
+'
+
+test_expect_success NO_GETTEXT_POISON 'git resolve output' '
        test_cmp resolve.expect resolve.output
 '