i18n: git-reset "Unstaged changes after reset" message
Gettextize the ""Unstaged changes after reset:" message. A test in t7102-reset.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>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:42 UTC
4d3cd970ee00afe095878d39299f08832934f685
2 files changed
+2
-2
builtin/reset.c
+1
-1
@@ -142,7 +142,7 @@ static int update_index_refresh(int fd, struct lock_file *index_lock, int flags)
142
return error(_("Could not read index"));
143
144
result = refresh_index(&the_index, (flags), NULL, NULL,
145
- "Unstaged changes after reset:") ? 1 : 0;
145
+ _("Unstaged changes after reset:")) ? 1 : 0;
146
if (write_cache(fd, active_cache, active_nr) ||
147
commit_locked_index(index_lock))
148
return error ("Could not refresh index");
t/t7102-reset.sh
+1
-1
@@ -423,7 +423,7 @@ Unstaged changes after reset:
423
M file2
424
EOF
425
426
-test_expect_success '--mixed refreshes the index' '
426
+test_expect_success C_LOCALE_OUTPUT '--mixed refreshes the index' '
427
echo 123 >> file2 &&
428
git reset --mixed HEAD > output &&
429
test_cmp expect output