[PATCH master] convert: The native line-ending is \r\n on MinGW

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



If you try this:

 1. Install Git for Windows (from the msysgit project)
 2. Put

	[core]
		autocrlf = false
		eol = native

    in your .gitconfig.
 3. Clone a project with

	*.txt text

    in its .gitattributes.

Then with current git, any text files checked out have LF line
endings, instead of the expected CRLF.

Cc: Johannes Schindelin <johannes.schindelin@xxxxxx>
Cc: Johannes Sixt <j6t@xxxxxxxx>
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
Eyvind Bernhardsen wrote:

> Introduce a new configuration variable, "core.eol", that allows the user
> to set which line endings to use for end-of-line-normalized files in the
> working directory.  It defaults to "native", which means CRLF on Windows
> and LF everywhere else.

The following fixup has been sitting in my tree (but not tested on
Windows) for a couple of weeks.  Sensible?

I don't know what the right choice for Cygwin is; probably LF unless
there is some way to detect the systemwide setting at run time.

 Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index 40fbcae..ba08051 100644
--- a/Makefile
+++ b/Makefile
@@ -1125,6 +1125,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 		compat/win32/pthread.o
 	EXTLIBS += -lws2_32
 	PTHREAD_LIBS =
+	NATIVE_CRLF = YesPlease
 	X = .exe
 ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
 	htmldir=doc/git/html/
-- 
1.7.2.3

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]