summaryrefslogtreecommitdiff
path: root/t/t7600-merge.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/t7600-merge.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/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 9e27bbf..5e19598 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -157,7 +157,7 @@ test_expect_success 'merge -h with invalid index' '
>.git/index &&
test_expect_code 129 git merge -h 2>usage
) &&
- grep "[Uu]sage: git merge" broken/usage
+ test_i18ngrep "[Uu]sage: git merge" broken/usage
'
test_expect_success 'reject non-strategy with a git-merge-foo name' '