Andrew's git / gitweb.git / diff
?
Merge branch 'tb/crlf-tests'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:37 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:37 +0000 (11:38 -0700)
* 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

1  2 
Makefile patch | diff1 | diff2 | blob | history
t/test-lib.sh patch | diff1 | diff2 | blob | history
diff --cc Makefile
Simple merge
diff --cc t/test-lib.sh
index 2b525a8e1d19cd11fea0ba06372111306ce7bf41,f359731c87055c9e56547ced99d0d6814b77821e..82095e34eeb7ce9932abe1a5e97b1c2eb0888033
--- 1/t/test-lib.sh
--- 2/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -870,6 -866,8 +870,7 @@@ case $(uname -s) i
        # backslashes in pathspec are converted to '/'
        # exec does not inherit the PID
        test_set_prereq MINGW
 -      test_set_prereq NOT_CYGWIN
+       test_set_prereq NATIVE_CRLF
        test_set_prereq SED_STRIPS_CR
        test_set_prereq GREP_STRIPS_CR
        GIT_TEST_CMP=mingw_test_cmp