diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-19 10:24:39 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-19 10:24:39 +0300 |
| commit | 954932667dac15885165cdb579acbf6a774fe140 (patch) | |
| tree | 73d9e230929da6c9ffcb17ac6a52516a7ff32e3f /t/t3406-rebase-message.sh | |
| parent | 0e94dab5be2fd17cfba634f8a29ba5461d2cbd9e (diff) | |
| parent | c6a9a30e6a01b4d5329d796b800ab0917b963b20 (diff) | |
Merge branch 'ab/dynamic-gettext-poison'
Our testing framework uses a special i18n "poisoned localization"
feature to find messages that ought to stay constant but are
incorrectly marked to be translated. This feature has been made
into a runtime option (it used to be a compile-time option).
* ab/dynamic-gettext-poison:
Makefile: ease dynamic-gettext-poison transition
i18n: make GETTEXT_POISON a runtime option
Diffstat (limited to 't/t3406-rebase-message.sh')
| -rwxr-xr-x | t/t3406-rebase-message.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index 2c79eed4fe..38bd876cab 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -77,7 +77,7 @@ test_expect_success 'rebase -n overrides config rebase.stat config' ' # "Does not point to a valid commit: invalid-ref" # # NEEDSWORK: This "grep" is fine in real non-C locales, but -# GETTEXT_POISON poisons the refname along with the enclosing +# GIT_TEST_GETTEXT_POISON poisons the refname along with the enclosing # error message. test_expect_success 'rebase --onto outputs the invalid ref' ' test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err && |