From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Sep 2012 18:07:59 +0000 (-0700)
Subject: Merge branch 'nd/i18n-poison-test-updates'
X-Git-Tag: v1.8.0-rc0~102
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bdac578482c5076078174f284d7c5d9d06940754;p=git.git

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
---

bdac578482c5076078174f284d7c5d9d06940754
diff --cc t/t2107-update-index-basic.sh
index 0dbbb00d7,17d69403e..a6405d318
--- a/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