diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-07 11:07:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-07 11:07:59 -0700 |
| commit | bdac578482c5076078174f284d7c5d9d06940754 (patch) | |
| tree | 217fcf4c44bcc0e8da42df1113bf31a8765fc22a /t/t2006-checkout-index-basic.sh | |
| parent | Update mailmap for a handful of folks (diff) | |
| parent | Fix tests under GETTEXT_POISON on parseopt (diff) | |
| download | tgif-bdac578482c5076078174f284d7c5d9d06940754.tar.xz | |
Merge branch 'nd/i18n-poison-test-updates'
Update tests that can be broken with gettext-poison builds.
* nd/i18n-poison-test-updates:
Fix tests under GETTEXT_POISON on parseopt
Fix tests under GETTEXT_POISON on git-remote
Fix tests under GETTEXT_POISON on pack-object
Fix tests under GETTEXT_POISON on git-apply
Fix tests under GETTEXT_POISON on diffstat
Fix tests under GETTEXT_POISON on git-stash
Fix tests under GETTEXT_POISON on relative dates
Diffstat (limited to 't/t2006-checkout-index-basic.sh')
| -rwxr-xr-x | t/t2006-checkout-index-basic.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t2006-checkout-index-basic.sh b/t/t2006-checkout-index-basic.sh index b8559838b1..57cbdfe9bc 100755 --- a/t/t2006-checkout-index-basic.sh +++ b/t/t2006-checkout-index-basic.sh @@ -7,7 +7,7 @@ test_description='basic checkout-index tests test_expect_success 'checkout-index --gobbledegook' ' test_expect_code 129 git checkout-index --gobbledegook 2>err && - grep "[Uu]sage" err + test_i18ngrep "[Uu]sage" err ' test_expect_success 'checkout-index -h in broken repository' ' @@ -18,7 +18,7 @@ test_expect_success 'checkout-index -h in broken repository' ' >.git/index && test_expect_code 129 git checkout-index -h >usage 2>&1 ) && - grep "[Uu]sage" broken/usage + test_i18ngrep "[Uu]sage" broken/usage ' test_done |