From: Erik Faye-Lund <kusmabite@gmail.com>
To: Junio C Hamano <gitster@pobox.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: Tue, 16 Apr 2013 16:39:26 +0200 [thread overview]
Message-ID: <CABPQNSZwc8Ae_fGwvyEq84NuBNntB7-KXnJtqt9ZLowCJof9Gw@mail.gmail.com> (raw)
In-Reply-To: <7vsj2rpj0j.fsf@alter.siamese.dyndns.org>
On Mon, Apr 15, 2013 at 11:43 PM, Junio C Hamano <gitster@pobox.com> wrote:
> 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 should probably clarify; conceptually, this is the right thing to
do. Git for Windows is a Windows application, and should have CRLF as
the native newline. I hadn't tested this patch myself, though. Our
tree is currently way behind yours, and I tried to do a rebase, but it
turned out much trickier than I was hoping for.
I've given it a go on top of your tree + some essential patches I'll
need to get things to run, and it seems to do what it claims to do.
However, I haven't been able to run the test-suite, because I need a
bunch more patches from the msysGit-tree for that.
> 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.
>
I agree. I don't think we need it in maint; we don't track that branch
for msysGit.
> 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
>
Looks fine to me.
next prev parent reply other threads:[~2013-04-16 14:40 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
2013-04-16 14:39 ` Erik Faye-Lund [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPQNSZwc8Ae_fGwvyEq84NuBNntB7-KXnJtqt9ZLowCJof9Gw@mail.gmail.com \
--to=kusmabite@gmail.com \
--cc=eyvind.bernhardsen@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=johannes.schindelin@gmx.de \
--cc=jrnieder@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).