[PATCH v4 41/73] gettextize: git-merge "Updating %s..%s" message
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Feb 22, 2011, 23:42 UTC
- Message-ID
- <1298418152-27789-42-git-send-email-avarab@gmail.com>
- In-Reply-To
- <7vhbbwdjnm.fsf@alter.siamese.dyndns.org>
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> --- builtin/merge.c | 2 +- t/t1200-tutorial.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c index 0be4dfa..4f6b34f 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1124,7 +1124,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 bfa2c21..3264fef 100755 --- 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 C_LOCALE_OUTPUT 'git resolve output' ' test_cmp resolve.expect resolve.output '
-- 1.7.2.3