i18n: 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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:42 UTC
2ceb61e0a030eddd46cc62e4d9a0fbf2d16faad1
2 files changed
+5
-2
builtin/merge.c
+1
-1
@@ -1124,7 +1124,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1124
strcpy(hex, find_unique_abbrev(head, DEFAULT_ABBREV));
1125
1126
if (verbosity >= 0)
1127
- printf("Updating %s..%s\n",
1127
+ printf(_("Updating %s..%s\n"),
1128
hex,
1129
find_unique_abbrev(remoteheads->item->object.sha1,
1130
DEFAULT_ABBREV));
t/t1200-tutorial.sh
+4
-1
@@ -163,7 +163,10 @@ test_expect_success 'git resolve' '
163
git checkout mybranch &&
164
git merge -m "Merge upstream changes." master |
165
sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
166
- -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output &&
166
+ -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output
167
+'
168
+
169
+test_expect_success C_LOCALE_OUTPUT 'git resolve output' '
170
test_cmp resolve.expect resolve.output
171
'
172