diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:47 -0700 |
| commit | a5ed26702b438de0ca90d11bd314596773f3c4aa (patch) | |
| tree | b01381e58d820c8a0913b8b3c0d7f544ed28ec98 /t | |
| parent | 9fcd14491d32d76c3533ba0b1dfe7cabf31fe852 (diff) | |
| parent | db424979a83c11d7e3389ed505b13e7e718132ec (diff) | |
| download | git-a5ed26702b438de0ca90d11bd314596773f3c4aa.tar.gz git-a5ed26702b438de0ca90d11bd314596773f3c4aa.tar.xz | |
Merge branch 'va/i18n'
More i18n.
* va/i18n:
i18n: diff: mark warnings for translation
i18n: credential-cache--daemon: mark advice for translation
i18n: convert mark error messages for translation
i18n: apply: mark error message for translation
i18n: apply: mark error messages for translation
i18n: apply: mark info messages for translation
i18n: apply: mark plural string for translation
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0020-crlf.sh | 6 | ||||
| -rwxr-xr-x | t/t4254-am-corrupt.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh index f94120a89..71350e065 100755 --- a/t/t0020-crlf.sh +++ b/t/t0020-crlf.sh @@ -83,7 +83,11 @@ test_expect_success 'safecrlf: print warning only once' ' git add doublewarn && git commit -m "nowarn" && for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >doublewarn && - test $(git add doublewarn 2>&1 | grep "CRLF will be replaced by LF" | wc -l) = 1 + git add doublewarn 2>err && + if test_have_prereq C_LOCALE_OUTPUT + then + test $(grep "CRLF will be replaced by LF" err | wc -l) = 1 + fi ' diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh index 9bd7dd2ba..168739c72 100755 --- a/t/t4254-am-corrupt.sh +++ b/t/t4254-am-corrupt.sh @@ -31,7 +31,7 @@ test_expect_success 'try to apply corrupted patch' ' test_expect_success 'compare diagnostic; ensure file is still here' ' echo "error: git diff header lacks filename information (line 4)" >expected && test_path_is_file f && - test_cmp expected actual + test_i18ncmp expected actual ' test_done |