From: Ævar Arnfjörð Bjarmason Date: Sun, 19 Sep 2010 13:36:28 +0000 (+0000) Subject: gettextize: git-reset "Unstaged changes after reset" message X-Git-Tag: ko-pu~10^2~93 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5b9eb769c76ac945879f6953245cbddd85912bf9;p=git.git gettextize: 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 --- diff --git a/builtin/reset.c b/builtin/reset.c index f6befc884..0557688c7 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -142,7 +142,7 @@ static int update_index_refresh(int fd, struct lock_file *index_lock, int flags) return error(_("Could not read index")); result = refresh_index(&the_index, (flags), NULL, NULL, - "Unstaged changes after reset:") ? 1 : 0; + _("Unstaged changes after reset:")) ? 1 : 0; if (write_cache(fd, active_cache, active_nr) || commit_locked_index(index_lock)) return error ("Could not refresh index"); diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index b8cf2603a..1370949ca 100755 --- a/t/t7102-reset.sh +++ b/t/t7102-reset.sh @@ -423,7 +423,7 @@ Unstaged changes after reset: M file2 EOF -test_expect_success '--mixed refreshes the index' ' +test_expect_success NO_GETTEXT_POISON '--mixed refreshes the index' ' echo 123 >> file2 && git reset --mixed HEAD > output && test_cmp expect output