diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-13 11:24:10 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 11:24:10 -0700 |
commit | 2703572b3a005848ed058d2775fb933a17ac3656 (patch) | |
tree | 8e4d016d4f8eb1975fb2b2325bdafd5ca74cd40f /t/t0008-ignores.sh | |
parent | b1ec08fda8e0c3ed19b680404770ca4ec313ca8c (diff) | |
parent | 415c7dd026e4649bea48c35ccbe29d2fa8b69be5 (diff) | |
download | git-2703572b3a005848ed058d2775fb933a17ac3656.tar.gz git-2703572b3a005848ed058d2775fb933a17ac3656.tar.xz |
Merge branch 'va/i18n-even-more'
More markings of messages for i18n, with updates to various tests
to pass GETTEXT_POISON tests.
One patch from the original submission dropped due to conflicts
with jk/upload-pack-hook, which is still in flux.
* va/i18n-even-more: (38 commits)
t5541: become resilient to GETTEXT_POISON
i18n: branch: mark comment when editing branch description for translation
i18n: unmark die messages for translation
i18n: submodule: escape shell variables inside eval_gettext
i18n: submodule: join strings marked for translation
i18n: init-db: join message pieces
i18n: remote: allow translations to reorder message
i18n: remote: mark URL fallback text for translation
i18n: standardise messages
i18n: sequencer: add period to error message
i18n: merge: change command option help to lowercase
i18n: merge: mark messages for translation
i18n: notes: mark options for translation
i18n: notes: mark strings for translation
i18n: transport-helper.c: change N_() call to _()
i18n: bisect: mark strings for translation
t5523: use test_i18ngrep for negation
t4153: fix negated test_i18ngrep call
t9003: become resilient to GETTEXT_POISON
tests: unpack-trees: update to use test_i18n* functions
...
Diffstat (limited to 't/t0008-ignores.sh')
-rwxr-xr-x | t/t0008-ignores.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh index b425f3a0d..d27f438bf 100755 --- a/t/t0008-ignores.sh +++ b/t/t0008-ignores.sh @@ -34,7 +34,7 @@ expect_from_stdin () { test_stderr () { expected="$1" expect_in stderr "$1" && - test_cmp "$HOME/expected-stderr" "$HOME/stderr" + test_i18ncmp "$HOME/expected-stderr" "$HOME/stderr" } broken_c_unquote () { @@ -47,7 +47,7 @@ broken_c_unquote_verbose () { stderr_contains () { regexp="$1" - if grep "$regexp" "$HOME/stderr" + if test_i18ngrep "$regexp" "$HOME/stderr" then return 0 else |