diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:42:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:56 -0800 |
| commit | 4d3cd970ee00afe095878d39299f08832934f685 (patch) | |
| tree | 80f5a15e620f20b51a67712df219a90e58978786 | |
| parent | 8b2a57b6c8711b7189184e4670d378d8418f7214 (diff) | |
| download | git-4d3cd970ee00afe095878d39299f08832934f685.tar.gz git-4d3cd970ee00afe095878d39299f08832934f685.tar.xz | |
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>
| -rw-r--r-- | builtin/reset.c | 2 | ||||
| -rwxr-xr-x | t/t7102-reset.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index 146517447..1fe5b0f9e 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..7be2ff38f 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 C_LOCALE_OUTPUT '--mixed refreshes the index' ' echo 123 >> file2 && git reset --mixed HEAD > output && test_cmp expect output |