diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 11:38:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 11:38:37 -0700 |
| commit | 70f003e1070f16594529d9fb0cc6c670c1e415e2 (patch) | |
| tree | 8f1295c935a37d4b09938e32b93292ec77226c3e /t/test-lib.sh | |
| parent | fbc122eafede5e5ee921b81dd42a41382eac035b (diff) | |
| parent | 5f4e02e5173c64b5b760f35283c4b0094bb85881 (diff) | |
| download | git-70f003e1070f16594529d9fb0cc6c670c1e415e2.tar.gz git-70f003e1070f16594529d9fb0cc6c670c1e415e2.tar.xz | |
Merge branch 'tb/crlf-tests'
* tb/crlf-tests:
MinGW: update tests to handle a native eol of crlf
Makefile: propagate NATIVE_CRLF to C
t0027: Tests for core.eol=native, eol=lf, eol=crlf
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 2b525a8e1..82095e34e 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -870,6 +870,7 @@ case $(uname -s) in # backslashes in pathspec are converted to '/' # exec does not inherit the PID test_set_prereq MINGW + test_set_prereq NATIVE_CRLF test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR GIT_TEST_CMP=mingw_test_cmp |