development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ab/i18n-test-fix'

Browse source 
* ab/i18n-test-fix:
  t/t7508-status.sh: use test_i18ncmp
  t/t6030-bisect-porcelain.sh: use test_i18ngrep
This commit is contained in:
Junio C Hamano 2011-11-06 21:22:22 -08:00
parent 78c17b9943 ca0f515d75
commit 5ae0f68160
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/t6030-bisect-porcelain.sh
View file

@ -164,7 +164,7 @@ test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if
cp .git/BISECT_START saved &&
test_must_fail git bisect start $HASH4 foo -- &&
git branch > branch.output &&
grep "* (no branch)" branch.output > /dev/null &&
test_i18ngrep "* (no branch)" branch.output > /dev/null &&
test_cmp saved .git/BISECT_START
'
test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' '

4
t/t7508-status.sh
View file

@ -189,7 +189,7 @@ test_expect_success 'status with gitignore' '
# untracked
EOF
git status --ignored >output &&
test_cmp expect output
test_i18ncmp expect output
'
test_expect_success 'status with gitignore (nothing untracked)' '
@ -247,7 +247,7 @@ test_expect_success 'status with gitignore (nothing untracked)' '
# untracked
EOF
git status --ignored >output &&
test_cmp expect output
test_i18ncmp expect output
'
rm -f .gitignore