From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 May 2011 19:00:27 +0000 (-0700)
Subject: Merge branch 'ab/i18n-fixup' into maint
X-Git-Tag: v1.7.5.4~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd4c0ce908f4ea89375aefb5566d4bf9ec21db5c;p=git.git

Merge branch 'ab/i18n-fixup' into maint

* ab/i18n-fixup: (24 commits)
  i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
  i18n: use test_i18n{grep,cmp} in t7508
  i18n: use test_i18ngrep in t7506
  i18n: use test_i18ngrep and test_i18ncmp in t7502
  i18n: use test_i18ngrep in t7501
  i18n: use test_i18ncmp in t7500
  i18n: use test_i18ngrep in t7201
  i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
  i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
  i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
  i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
  i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
  i18n: use test_i18ngrep in lib-httpd and t2019
  i18n: do not overuse C_LOCALE_OUTPUT (grep)
  i18n: use test_i18ncmp in t1200 and t2200
  i18n: .git file is not a human readable message (t5601)
  i18n: do not overuse C_LOCALE_OUTPUT
  i18n: mark init-db messages for translation
  i18n: mark checkout plural warning for translation
  i18n: mark checkout --detach messages for translation
  ...
---

dd4c0ce908f4ea89375aefb5566d4bf9ec21db5c
diff --cc t/t4001-diff-rename.sh
index 3dadf9b31,9a16d1cd9..844277cfa
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@@ -71,35 -71,10 +71,35 @@@ test_expect_success 'favour same basena
  	git rm path1 &&
  	mkdir subdir &&
  	git mv another-path subdir/path1 &&
- 	git status | grep "renamed: .*path1 -> subdir/path1"'
+ 	git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"'
  
- test_expect_success C_LOCALE_OUTPUT  'favour same basenames even with minor differences' '
+ test_expect_success 'favour same basenames even with minor differences' '
  	git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
- 	git status | grep "renamed: .*path1 -> subdir/path1"'
+ 	git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"'
  
 +test_expect_success 'setup for many rename source candidates' '
 +	git reset --hard &&
 +	for i in 0 1 2 3 4 5 6 7 8 9;
 +	do
 +		for j in 0 1 2 3 4 5 6 7 8 9;
 +		do
 +			echo "$i$j" >"path$i$j"
 +		done
 +	done &&
 +	git add "path??" &&
 +	test_tick &&
 +	git commit -m "hundred" &&
 +	(cat path1; echo new) >new-path &&
 +	echo old >>path1 &&
 +	git add new-path path1 &&
 +	git diff -l 4 -C -C --cached --name-status >actual 2>actual.err &&
 +	sed -e "s/^\([CM]\)[0-9]*	/\1	/" actual >actual.munged &&
 +	cat >expect <<-EOF &&
 +	C	path1	new-path
 +	M	path1
 +	EOF
 +	test_cmp expect actual.munged &&
 +	grep warning actual.err
 +'
 +
  test_done