diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:41:56 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:55 -0800 |
| commit | e4fe4ba57ae32a5a1334db4206412e12333754a3 (patch) | |
| tree | 4a2041a4b3a5b3bf096cd9fa05d3fe3657ad470c | |
| parent | 2fc5f9f189512b82f2154658079e9c3889d4c136 (diff) | |
| download | git-e4fe4ba57ae32a5a1334db4206412e12333754a3.tar.gz git-e4fe4ba57ae32a5a1334db4206412e12333754a3.tar.xz | |
i18n: git-grep "--open-files-in-pager" message
Gettextize the "--open-files-in-pager only works on the worktree"
message. A test in t7811-grep-open.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/grep.c | 2 | ||||
| -rwxr-xr-x | t/t7811-grep-open.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index d35b76cbb..dfc32fbe6 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1061,7 +1061,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) } if (show_in_pager && (cached || list.nr)) - die("--open-files-in-pager only works on the worktree"); + die(_("--open-files-in-pager only works on the worktree")); if (show_in_pager && opt.pattern_list && !opt.pattern_list->next) { const char *pager = path_list.items[0].string; diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh index 568a6f2b6..aedf484fe 100755 --- a/t/t7811-grep-open.sh +++ b/t/t7811-grep-open.sh @@ -61,7 +61,7 @@ test_expect_success SIMPLEPAGER 'git grep -O' ' test_cmp empty out ' -test_expect_success 'git grep -O --cached' ' +test_expect_success C_LOCALE_OUTPUT 'git grep -O --cached' ' test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg && grep open-files-in-pager msg ' |