diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:21:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:21:18 -0700 |
| commit | 2bf3501150145d1f05678c20ab8e8d66f849851f (patch) | |
| tree | 9b42d85557424e9c0836b4c47ea9d8b86ff2dc1d /t/test-lib.sh | |
| parent | 677f32c79f30cafc4a3270118d5cb3736d44be26 (diff) | |
| parent | 97669eed109f5dea7dffe771d8f6aba4acf84b27 (diff) | |
| download | git-2bf3501150145d1f05678c20ab8e8d66f849851f.tar.gz | |
Merge branch 'ml/avoid-using-grep-on-crlf-files'
On systems that understand a CRLF as a line ending, tests in this
script that worked on files with CRLF line endings using "grep" to
extract matching lines may lose the CR at the end of lines that
match, causing the actual output not to match the expected output.
* ml/avoid-using-grep-on-crlf-files:
test-lib.sh - define and use GREP_STRIPS_CR
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index b490283182..1aa27bdbbf 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -825,6 +825,7 @@ case $(uname -s) in test_set_prereq MINGW test_set_prereq NOT_CYGWIN test_set_prereq SED_STRIPS_CR + test_set_prereq GREP_STRIPS_CR ;; *CYGWIN*) test_set_prereq POSIXPERM @@ -832,6 +833,7 @@ case $(uname -s) in test_set_prereq NOT_MINGW test_set_prereq CYGWIN test_set_prereq SED_STRIPS_CR + test_set_prereq GREP_STRIPS_CR ;; *) test_set_prereq POSIXPERM |