diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-27 21:33:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 21:33:58 +0300 |
| commit | d4053966ea71a9f6460419fd68db912bda91ff85 (patch) | |
| tree | 3426a84fcfa48a1bec45471c358e83f11e6e013e /t | |
| parent | e3eb4050272e790ee9c7d9e08e44b34322387da6 (diff) | |
| parent | fc045fe7d4fa220f19274715c936636fe0516ea3 (diff) | |
Merge branch 'as/ll-i18n'
Some messages in low level start-up codepath have been i18n-ized.
* as/ll-i18n:
Mark messages for translations
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0002-gitfile.sh | 4 | ||||
| -rwxr-xr-x | t/t0008-ignores.sh | 2 | ||||
| -rwxr-xr-x | t/t1506-rev-parse-diagnosis.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh index fb8d094117..3691023d51 100755 --- a/t/t0002-gitfile.sh +++ b/t/t0002-gitfile.sh @@ -18,13 +18,13 @@ test_expect_success 'initial setup' ' test_expect_success 'bad setup: invalid .git file format' ' echo "gitdir $REAL" >.git && test_must_fail git rev-parse 2>.err && - grep "Invalid gitfile format" .err + test_i18ngrep "invalid gitfile format" .err ' test_expect_success 'bad setup: invalid .git file path' ' echo "gitdir: $REAL.not" >.git && test_must_fail git rev-parse 2>.err && - grep "Not a git repository" .err + test_i18ngrep "not a git repository" .err ' test_expect_success 'final setup + check rev-parse --git-dir' ' diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh index 54a4703ef1..c03f155a35 100755 --- a/t/t0008-ignores.sh +++ b/t/t0008-ignores.sh @@ -307,7 +307,7 @@ test_expect_success_multi 'needs work tree' '' ' cd .git && test_check_ignore "foo" 128 ) && - stderr_contains "fatal: This operation must be run in a work tree" + stderr_contains "fatal: this operation must be run in a work tree" ' ############################################################################ diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh index 79a0251efa..4ee009da66 100755 --- a/t/t1506-rev-parse-diagnosis.sh +++ b/t/t1506-rev-parse-diagnosis.sh @@ -157,7 +157,7 @@ test_expect_success 'relative path not found' ' test_expect_success 'relative path outside worktree' ' test_must_fail git rev-parse HEAD:../file.txt >output 2>error && test -z "$(cat output)" && - grep "outside repository" error + test_i18ngrep "outside repository" error ' test_expect_success 'relative path when cwd is outside worktree' ' |