summaryrefslogtreecommitdiff
path: root/t/t4200-rerere.sh
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2012-08-27 05:36:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-27 16:26:30 (GMT)
commit9a0013819ea541cfa1102292d1fdceb30352c2c3 (patch)
tree00862b29ba21cb7f494a66d157c89856dc24fa1b /t/t4200-rerere.sh
parentf7dc6a96435e050afbbdbdeffac481fea7ddb8af (diff)
downloadgit-9a0013819ea541cfa1102292d1fdceb30352c2c3.zip
git-9a0013819ea541cfa1102292d1fdceb30352c2c3.tar.gz
git-9a0013819ea541cfa1102292d1fdceb30352c2c3.tar.bz2
Fix tests under GETTEXT_POISON on parseopt
Use the i18n-specific test functions in test scripts for parseopt tests. This issue was was introduced in v1.7.10.1-488-g54e6d: 54e6d i18n: parseopt: lookup help and argument translations when showing usage 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/t4200-rerere.sh')
-rwxr-xr-xt/t4200-rerere.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 3ab670d..7f6666f 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -382,13 +382,13 @@ test_expect_success 'rerere --no-no-rerere-autoupdate' '
git update-index --index-info <failedmerge &&
cp file3.conflict file3 &&
test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
- grep [Uu]sage err &&
+ test_i18ngrep [Uu]sage err &&
test_must_fail git update-index --refresh
'
test_expect_success 'rerere -h' '
test_must_fail git rerere -h >help &&
- grep [Uu]sage help
+ test_i18ngrep [Uu]sage help
'
test_done