From: Ævar Arnfjörð Bjarmason Date: Tue, 22 Feb 2011 23:42:02 +0000 (+0000) Subject: i18n: git-merge "Wonderful" message X-Git-Tag: v1.7.5-rc1~19^2~30 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=157efde10f34344f0970ca71f33dd5ae1c29b6f5;p=git.git i18n: git-merge "Wonderful" message Gettextize the "Wonderful" message. A test in t7600-merge.sh explicitly checked for this message. Change it to skip under GETTEXT_POISON=YesPlease. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/builtin/merge.c b/builtin/merge.c index 4f6b34f23..f99820661 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -803,7 +803,7 @@ static int merge_trivial(void) struct commit_list *parent = xmalloc(sizeof(*parent)); write_tree_trivial(result_tree); - printf("Wonderful.\n"); + printf(_("Wonderful.\n")); parent->item = lookup_commit(head); parent->next = xmalloc(sizeof(*parent->next)); parent->next->item = remoteheads->item; diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index b147a1bd6..87d5d788c 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -495,7 +495,7 @@ test_expect_success 'merge fast-forward in a dirty tree' ' test_debug 'git log --graph --decorate --oneline --all' -test_expect_success 'in-index merge' ' +test_expect_success C_LOCALE_OUTPUT 'in-index merge' ' git reset --hard c0 && git merge --no-ff -s resolve c1 >out && grep "Wonderful." out &&