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

diff --cc t/t2107-update-index-basic.sh
index 0dbbb00d740da8b1e62325c7daea659bb97eb399,17d69403ee711c5672506af77e4c3489f1f13055..a6405d318d322b9e1f49e4762570a2c1f5371726
--- 1/t/t2107-update-index-basic.sh
--- 2/t/t2107-update-index-basic.sh
+++ b/t/t2107-update-index-basic.sh
@@@ -26,26 -26,7 +26,26 @@@ test_expect_success 'update-index -h wi
                >.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' '
 +      echo content >file &&
 +      git add file &&
 +      git rev-parse :file >expect &&
 +      test_must_fail git update-index --cacheinfo 100644 $_z40 file &&
 +      git rev-parse :file >actual &&
 +      test_cmp expect actual
 +'
 +
 +test_expect_success '--cacheinfo does not accept gitlink null sha1' '
 +      git init submodule &&
 +      (cd submodule && test_commit foo) &&
 +      git add submodule &&
 +      git rev-parse :submodule >expect &&
 +      test_must_fail git update-index --cacheinfo 160000 $_z40 submodule &&
 +      git rev-parse :submodule >actual &&
 +      test_cmp expect actual
 +'
 +
  test_done