git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alex Stangl <alex@stangl.us>
To: git@vger.kernel.org
Subject: Re: error: core.autocrlf=input conflicts with core.eol=crlf
Date: Fri, 5 Dec 2014 10:33:58 -0600	[thread overview]
Message-ID: <20141205163358.GA77231@scout.stangl.us> (raw)
In-Reply-To: <5481D587.2050103@web.de>

On Fri, Dec 05, 2014 at 04:55:51PM +0100, Torsten B?gershausen wrote:
> On 12/05/2014 09:10 AM, Torsten B?gershausen wrote:
> Or a test case showing the problem is welcome too.

I mentioned some examples in my previous post. Here they are in
condensed form. They assume core.eol isn't set in your global config.

These work fine:
$ mkdir -p /tmp/ex1_$$;cd /tmp/ex1_$$;git init;git config --global core.autocrlf input;git config core.autocrlf false;git config core.eol crlf;git status                                                                                                                                                                                                     
$ mkdir -p /tmp/ex3_$$;cd /tmp/ex3_$$;git init;git config --global core.autocrlf input;git -c core.autocrlf=false -c core.eol=crlf status

These equivalents fail:
$ mkdir -p /tmp/ex2_$$;cd /tmp/ex2_$$;git init;git config --global core.autocrlf input;git config core.eol crlf;git config core.autocrlf false;git status
$ mkdir -p /tmp/ex4_$$;cd /tmp/ex4_$$;git init;git config --global core.autocrlf input;git -c core.eol=crlf -c core.autocrlf=false status

Alex

      reply	other threads:[~2014-12-05 16:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-05  5:42 error: core.autocrlf=input conflicts with core.eol=crlf Alex Stangl
     [not found] ` <54816863.90208@web.de>
2014-12-05 15:55   ` Torsten Bögershausen
2014-12-05 16:33     ` Alex Stangl [this message]

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=20141205163358.GA77231@scout.stangl.us \
    --to=alex@stangl.us \
    --cc=git@vger.kernel.org \
    /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 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 NNTP newsgroup(s).