diff options
| author |  Vasco Almeida <vascomalmeida@sapo.pt> | 2016-10-17 13:15:27 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-10-17 14:51:45 -0700 |
| commit | 87cb7845fee4f23434da8b601583dab225dd85d6 (patch) | |
| tree | 2c3651a30547111f1a59a817491b365931fc19a6 /t | |
| parent | i18n: apply: mark error message for translation (diff) | |
| download | tgif-87cb7845fee4f23434da8b601583dab225dd85d6.tar.xz | |
i18n: convert mark error messages for translation
Mark error messages about CRLF for translation.
Update test to reflect changes.
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0020-crlf.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh index f94120a894..71350e0657 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 ' |