From: Junio C Hamano <gitster@pobox.com>
To: kusmabite@gmail.com
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Sixt <j6t@kdbg.org>,
Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>,
git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH master] convert: The native line-ending is \r\n on MinGW
Date: Mon, 15 Apr 2013 14:43:24 -0700 [thread overview]
Message-ID: <7vsj2rpj0j.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CABPQNSaA7Qdt5eCZR3rs87gL730Y_xMrg6S-++YuaXdC2k45jg@mail.gmail.com> (Erik Faye-Lund's message of "Mon, 15 Apr 2013 23:20:01 +0200")
Erik Faye-Lund <kusmabite@gmail.com> writes:
> This is absolutely the right thing to do. However, stuff have changed
> a bit since the patch was written; this change now needs to go in
> config.mak.uname instead of config.mak.
Thanks for a quick response.
What's your preference? I could just ignore a patch I won't be able
to test myself and have you guys carry it in your tree forever, but
I do not think that is necessary for something small like this.
I think this is low impact enough that it can directly go to
'master' or even 'maint' if I were to apply to my tree.
Thanks.
-- >8 --
From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 4 Sep 2010 03:25:09 -0500
Subject: [PATCH] convert: The native line-ending is \r\n on MinGW
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@gmx.de>
Cc: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
config.mak.uname | 1 +
1 file changed, 1 insertion(+)
diff --git a/config.mak.uname b/config.mak.uname
index 9080054..d78fd3d 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -507,6 +507,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
compat/win32/dirent.o
EXTLIBS += -lws2_32
PTHREAD_LIBS =
+ NATIVE_CRLF = YesPlease
X = .exe
SPARSE_FLAGS = -Wno-one-bit-signed-bitfield
ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
--
1.8.2.1-542-g3613165
next prev parent reply other threads:[~2013-04-15 21:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-04 19:29 [PATCH v6] Add "core.eol" config variable Eyvind Bernhardsen
2010-09-04 8:25 ` [PATCH master] convert: The native line-ending is \r\n on MinGW Jonathan Nieder
2010-09-07 0:29 ` Junio C Hamano
2010-09-25 17:14 ` Ramsay Jones
2012-11-25 15:39 ` Mr_and_Mrs_D
2013-04-15 20:11 ` Brice Lambson
2013-08-13 17:44 ` Tvangeste
2013-08-13 18:03 ` Junio C Hamano
2013-04-15 21:00 ` Junio C Hamano
2013-04-15 21:20 ` Erik Faye-Lund
2013-04-15 21:43 ` Junio C Hamano [this message]
2013-04-16 14:39 ` Erik Faye-Lund
2013-04-16 18:03 ` Johannes Sixt
2013-04-16 18:26 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vsj2rpj0j.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=eyvind.bernhardsen@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=johannes.schindelin@gmx.de \
--cc=jrnieder@gmail.com \
--cc=kusmabite@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.