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/t2107-update-index-basic.sh | |
| parent | 3fc0e4ca00330ce1dfd92baeda04f0aa2fbd7e68 (diff) | |
| parent | 9a0013819ea541cfa1102292d1fdceb30352c2c3 (diff) | |
| download | git-bdac578482c5076078174f284d7c5d9d06940754.tar.gz git-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/t2107-update-index-basic.sh')
| -rwxr-xr-x | t/t2107-update-index-basic.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh index 0dbbb00d7..a6405d318 100755 --- a/t/t2107-update-index-basic.sh +++ b/t/t2107-update-index-basic.sh @@ -15,7 +15,7 @@ test_expect_success 'update-index --nonsense fails' ' test_expect_success 'update-index --nonsense dumps usage' ' test_expect_code 129 git update-index --nonsense 2>err && - grep "[Uu]sage: git update-index" err + test_i18ngrep "[Uu]sage: git update-index" err ' test_expect_success 'update-index -h with corrupt index' ' @@ -26,7 +26,7 @@ test_expect_success 'update-index -h with corrupt index' ' >.git/index && test_expect_code 129 git update-index -h >usage 2>&1 ) && - grep "[Uu]sage: git update-index" broken/usage + test_i18ngrep "[Uu]sage: git update-index" broken/usage ' test_expect_success '--cacheinfo does not accept blob null sha1' ' |