From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2014 18:38:37 +0000 (-0700)
Subject: Merge branch 'tb/crlf-tests'
X-Git-Tag: v2.2.0-rc0~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70f003e1070f16594529d9fb0cc6c670c1e415e2;p=thirdparty%2Fgit.git

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
---

70f003e1070f16594529d9fb0cc6c670c1e415e2
diff --cc t/test-lib.sh
index 2b525a8e1d,f359731c87..82095e34ee
--- a/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