diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-06 21:22:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-06 21:22:22 -0800 |
| commit | 5ae0f68160a189fafc2cf50b9a35aacc73cf8209 (patch) | |
| tree | 7f620020721d18e07a8505d1aac8913bf110d550 | |
| parent | 78c17b9943ade62e6eebe069fadaecc637b301df (diff) | |
| parent | ca0f515d75ee3328b8fa70f6eeedb4f06ba79028 (diff) | |
| download | git-5ae0f68160a189fafc2cf50b9a35aacc73cf8209.tar.gz | |
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
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 2 | ||||
| -rwxr-xr-x | t/t7508-status.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index c6f1f9f8ab..691e4a4481 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -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' ' diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 905255adf0..fc57b135c5 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -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 |