diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-08-27 13:36:52 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-27 09:26:30 -0700 |
| commit | 76638d90e88374f8b1396e4fce75a424260ba6da (patch) | |
| tree | 1b60cec3a2bc581a8afb8c2d115a0940db08f396 /t/t4120-apply-popt.sh | |
| parent | b354f11b595bb2bca4bae96b06778b3a9882b621 (diff) | |
| download | git-76638d90e88374f8b1396e4fce75a424260ba6da.tar.gz | |
Fix tests under GETTEXT_POISON on git-apply
Use the i18n-specific test functions in test scripts for git-apply.
This issue was was introduced in the following commits:
de373 i18n: apply: mark parseopt strings for translation
3638e i18n: apply: mark strings for translation
and been broken under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4120-apply-popt.sh')
| -rwxr-xr-x | t/t4120-apply-popt.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh index a33d510bf6..c5fecdfed4 100755 --- a/t/t4120-apply-popt.sh +++ b/t/t4120-apply-popt.sh @@ -32,7 +32,7 @@ test_expect_success 'apply git diff with -p2' ' test_expect_success 'apply with too large -p' ' cp file1.saved file1 && test_must_fail git apply --stat -p3 patch.file 2>err && - grep "removing 3 leading" err + test_i18ngrep "removing 3 leading" err ' test_expect_success 'apply (-p2) traditional diff with funny filenames' ' @@ -54,7 +54,7 @@ test_expect_success 'apply (-p2) traditional diff with funny filenames' ' test_expect_success 'apply with too large -p and fancy filename' ' cp file1.saved file1 && test_must_fail git apply --stat -p3 patch.escaped 2>err && - grep "removing 3 leading" err + test_i18ngrep "removing 3 leading" err ' test_expect_success 'apply (-p2) diff, mode change only' ' |