From: Finn Arne Gangstad <finnag@pvv.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>,
"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>,
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 20:18:53 +0200 [thread overview]
Message-ID: <20100509181853.GA4676@pvv.org> (raw)
In-Reply-To: <7v632x9dfk.fsf@alter.siamese.dyndns.org>
On Sun, May 09, 2010 at 10:45:35AM -0700, Junio C Hamano wrote:
> Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> writes:
>
> > My user interface would have been:
> >
> > - an attribute "eolconv" that enables or disables line ending conversion
> > - a config variable "core.eolconv" that sets "eolconv" for all files where it is unset
> > - a config variable "core.localeol" that decides whether LF or CRLF is preferred
>
> I am puzzled about this second item; what is its type and what is its
> purpose? If it is to allow project-wide default to be specified, then
> isn't having "* eolconv=true" in .gitattributes a much better option and
> is already supported by the first item?
The way I understood it core.eolconv has exactly the same possible
values as the "eolconv" attribute, and serves as a default value for
"eolconv" if it isn't set. This would (mostly, I guess) be for Windows
users who would like to check out a project that is primarily
developed on Unix and didn't bother to set any eolconv attributes, and
still get CRLF line endings. core.eolconv has some of the drawbacks
of autocrlf, so shouldn't really be used if you can convince projects
to add eolconv attributes instead.
Are you thinking we could live completely without it? Most other
popular vcs-systems have eol-conversion/normalisation on by default,
while git has it disabled by default. The config variable can change
the default behaviour, but is isn't as helpful as it should have been
perhaps.
To do a better job with old un-normalised repos, we could for each
file remember what their eol-style was (CR, LF, CRLF, mixed), and then
even if doing output conversion on checkout, convert back to the same
eol style on commit. This would perhaps break down a bit for renames,
but would be lovely if it worked for merges for example...
- Finn Arne
next prev parent reply other threads:[~2010-05-09 18:19 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 [this message]
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
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=20100509181853.GA4676@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).