Skip to content

Commit 5ae0f68

Browse files
committed
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
2 parents 78c17b9 + ca0f515 commit 5ae0f68

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

t/t6030-bisect-porcelain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if
164164
cp .git/BISECT_START saved &&
165165
test_must_fail git bisect start $HASH4 foo -- &&
166166
git branch > branch.output &&
167-
grep "* (no branch)" branch.output > /dev/null &&
167+
test_i18ngrep "* (no branch)" branch.output > /dev/null &&
168168
test_cmp saved .git/BISECT_START
169169
'
170170
test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' '

t/t7508-status.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ test_expect_success 'status with gitignore' '
189189
# untracked
190190
EOF
191191
git status --ignored >output &&
192-
test_cmp expect output
192+
test_i18ncmp expect output
193193
'
194194

195195
test_expect_success 'status with gitignore (nothing untracked)' '
@@ -247,7 +247,7 @@ test_expect_success 'status with gitignore (nothing untracked)' '
247247
# untracked
248248
EOF
249249
git status --ignored >output &&
250-
test_cmp expect output
250+
test_i18ncmp expect output
251251
'
252252

253253
rm -f .gitignore

0 commit comments

Comments
 (0)