git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Finn Arne Gangstad <finnag@pvv.org>
To: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Cc: "git@vger.kernel.org List" <git@vger.kernel.org>,
	Dmitry Potapov <dpotapov@gmail.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	mat <matthieu.stigler@gmail.com>,
	hasen j <hasan.aljudy@gmail.com>,
	Erik Faye-Lund <kusmabite@googlemail.com>,
	Junio C Hamano <gitster@pobox.com>,
	Avery Pennarun <apenwarr@gmail.com>,
	Robert Buck <buck.robert.j@gmail.com>
Subject: Re: [PATCH/RFC v2 1/4] Add "core.eolStyle" variable to control end-of-line conversion
Date: Sun, 9 May 2010 22:09:37 +0200	[thread overview]
Message-ID: <20100509200935.GA22563@pvv.org> (raw)
In-Reply-To: <CD080D38-811C-4BBF-A5CB-6B613555FE72@gmail.com>

On Sun, May 09, 2010 at 12:42:17PM +0200, Eyvind Bernhardsen wrote:

> I guess I should nail my flag to the mast: Here's what I would have
> done, with the benefit of plenty of hindsight, had we not had
> core.autocrlf, and also what I think we should do to approach that
> ideal.
> [...]

After some meditation, I think the following:

The most important thing is how we can fix git on Windows to operate
well by default. This is what we really should try to fix.

The way git on Windows would work best, while at the same time cause
the minimum amount of damage, would IMHO be:

- Convert LF-only text files to CRLF on checkout
- Convert those same files (but only those!) back to LF on commit
- Optionally: Convert new CRLF text files to LF on commit

And all this should happen without setting any configuration, and not
setting any attributes.

So maybe, just maybe, we can make everything sufficiently good by
repairing "core.autocrlf = {input,true}" so that git will not convert
a CRLF already in the repo. This would make autocrlf = true a safe
default value (and probably input too, but you'd have to "do
something" to get a new text file with CRLF into the repo then).

Then we go from a situation that didn't work, to a working situation,
and break nothing that used to work. You no longer have to normalise
your repos to work from Windows.

- Finn Arne

  parent reply	other threads:[~2010-05-09 20:10 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-08 21:46 [PATCH/RFC v2 0/4] End-of-line normalization, take 2 (now only slightly scary) Eyvind Bernhardsen
2010-05-08 21:46 ` [PATCH/RFC v2 1/4] Add "core.eolStyle" variable to control end-of-line conversion Eyvind Bernhardsen
2010-05-08 21:57   ` Linus Torvalds
2010-05-08 22:17     ` Eyvind Bernhardsen
2010-05-08 22:53       ` Eyvind Bernhardsen
2010-05-08 23:08         ` Linus Torvalds
2010-05-09  8:13           ` Eyvind Bernhardsen
2010-05-09 18:11             ` Linus Torvalds
2010-05-09 20:11               ` Eyvind Bernhardsen
2010-05-09  7:00         ` Dmitry Potapov
2010-05-09  7:30           ` hasen j
2010-05-10  7:16             ` Dmitry Potapov
2010-05-09  8:34           ` Eyvind Bernhardsen
2010-05-09 10:42           ` Eyvind Bernhardsen
2010-05-09 11:14             ` Robert Buck
2010-05-09 18:59               ` Eyvind Bernhardsen
2010-05-09 20:46                 ` Robert Buck
2010-05-10  4:33                   ` Eyvind Bernhardsen
2010-05-10 11:43                     ` Robert Buck
2010-05-10 13:25                       ` Robert Buck
2010-05-10 14:03                         ` Dmitry Potapov
2010-05-09 17:02             ` Jay Soffian
2010-05-09 17:43               ` Jay Soffian
2010-05-10 18:33               ` Eyvind Bernhardsen
2010-05-09 17:45             ` Junio C Hamano
2010-05-09 18:18               ` Finn Arne Gangstad
2010-05-09 21:57                 ` Junio C Hamano
2010-05-10  5:14                   ` Eyvind Bernhardsen
2010-05-09 20:25               ` Eyvind Bernhardsen
2010-05-09 20:09             ` Finn Arne Gangstad [this message]
2010-05-10  8:13               ` Dmitry Potapov
2010-05-10 11:14                 ` Finn Arne Gangstad
2010-05-10 13:46                   ` Dmitry Potapov
2010-05-09  9:21         ` Finn Arne Gangstad
2010-05-08 21:46 ` [PATCH/RFC v2 2/4] Add tests for per-repository eol normalization Eyvind Bernhardsen
2010-05-08 21:46 ` [PATCH/RFC v2 3/4] Pass eol conv mode as an argument instead of using global auto_crlf Eyvind Bernhardsen
2010-05-08 21:46 ` [PATCH/RFC v2 4/4] Add per-repository eol normalization Eyvind Bernhardsen

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=20100509200935.GA22563@pvv.org \
    --to=finnag@pvv.org \
    --cc=apenwarr@gmail.com \
    --cc=buck.robert.j@gmail.com \
    --cc=dpotapov@gmail.com \
    --cc=eyvind.bernhardsen@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=hasan.aljudy@gmail.com \
    --cc=kusmabite@googlemail.com \
    --cc=matthieu.stigler@gmail.com \
    --cc=torvalds@linux-foundation.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).