undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-merge "Wonderful" message

Browse Source 
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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2011-02-22 23:42:02 +00:00 committed by Junio C Hamano
parent 2ce216eeda
commit 157efde10f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge.c
View File

@ -803,7 +803,7 @@ static int merge_trivial(void)
struct commit_list *parent = xmalloc(sizeof(*parent)); struct commit_list *parent = xmalloc(sizeof(*parent));
write_tree_trivial(result_tree); write_tree_trivial(result_tree);
printf("Wonderful.\n"); printf(_("Wonderful.\n"));
parent->item = lookup_commit(head); parent->item = lookup_commit(head);
parent->next = xmalloc(sizeof(*parent->next)); parent->next = xmalloc(sizeof(*parent->next));
parent->next->item = remoteheads->item; parent->next->item = remoteheads->item;

2
t/t7600-merge.sh
View File

@ -495,7 +495,7 @@ test_expect_success 'merge fast-forward in a dirty tree' '
test_debug 'git log --graph --decorate --oneline --all' 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 reset --hard c0 &&
git merge --no-ff -s resolve c1 >out && git merge --no-ff -s resolve c1 >out &&
grep "Wonderful." out && grep "Wonderful." out &&