diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-05-23 13:46:08 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-05-23 13:46:09 +0900 |
commit | 6a0bc7cf0efbefa5a949d958947e68e29534f04d (patch) | |
tree | b1b5d9c52347c73b2c9fa8fa2671506b9597e670 /t/t7509-commit.sh | |
parent | Merge branch 'tb/dedup-crlf-tests' (diff) | |
parent | travis-ci: add job to run tests with GETTEXT_POISON (diff) | |
download | tgif-6a0bc7cf0efbefa5a949d958947e68e29534f04d.tar.xz |
Merge branch 'ab/fix-poison-tests'
Update tests to pass under GETTEXT_POISON (a mechanism to ensure
that output strings that should not be translated are not
translated by mistake), and tell TravisCI to run them.
* ab/fix-poison-tests:
travis-ci: add job to run tests with GETTEXT_POISON
travis-ci: setup "prove cache" in "script" step
tests: fix tests broken under GETTEXT_POISON=YesPlease
Diffstat (limited to 't/t7509-commit.sh')
-rwxr-xr-x | t/t7509-commit.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7509-commit.sh b/t/t7509-commit.sh index db9774e345..ddef7ea6b0 100755 --- a/t/t7509-commit.sh +++ b/t/t7509-commit.sh @@ -101,7 +101,7 @@ test_expect_success '--amend option with empty author' ' echo "Empty author test" >>foo && test_tick && test_must_fail git commit -a -m "empty author" --amend 2>err && - grep "empty ident" err + test_i18ngrep "empty ident" err ' test_expect_success '--amend option with missing author' ' @@ -114,7 +114,7 @@ test_expect_success '--amend option with missing author' ' echo "Missing author test" >>foo && test_tick && test_must_fail git commit -a -m "malformed author" --amend 2>err && - grep "empty ident" err + test_i18ngrep "empty ident" err ' test_expect_success '--reset-author makes the commit ours even with --amend option' ' |