Merge branch 'ab/i18n-test-fix'
* ab/i18n-test-fix: t/t7508-status.sh: use test_i18ncmp t/t6030-bisect-porcelain.sh: use test_i18ngrep
This commit is contained in:
commit
5ae0f68160
@ -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' '
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user