From: Jonathan Nieder <jrnieder@gmail.com>
To: Robert Buck <buck.robert.j@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>,
git@vger.kernel.org, msysGit <msysgit@googlegroups.com>,
Junio C Hamano <gitster@pobox.com>,
Dmitry Potapov <dpotapov@gmail.com>,
Finn Arne Gangstad <finnag@pvv.org>,
Jay Soffian <jaysoffian@gmail.com>
Subject: Re: [RFC/PATCH v3 4/5] Rename "crlf" attribute as "eolconv"
Date: Thu, 13 May 2010 23:56:46 -0500 [thread overview]
Message-ID: <20100514045646.GA2433@progeny.tock> (raw)
In-Reply-To: <AANLkTil1i_vFAvT1CotYdK47LnufVKc17-1168rOVcMX@mail.gmail.com>
Hi Bob,
Robert Buck wrote:
> * text
> *.foo binary
>
> means autoconvert everything regardless of the autocrlf setting,
> except for .foo files ? So now we can dispense with the autocrlf
> attribute altogether if we so wish?
If I understand correctly, there is no autocrlf attribute, just a
configuration item. If you put
* crlf
*.foo -crlf
in your .gitattributes with current git, this means:
- if the '[core] autocrlf' configuration is not set, do not convert
anything;
- otherwise, convert everything except for .foo files
Eyvind’s series improves that in a few ways.
- [from Finn Arne Gangstad] If the in-repository copy of a file
contains any carriage returns, do not try to convert it. This
makes it easier to deal with mistakes.
- For files with crlf enabled through attributes, always convert,
whether '[core] autocrlf' is enabled or not.
- Use the '[core] autocrlf' setting to determine the desired
line-ending for checked-out files (\r\n if true, \n otherwise).
A new eol attribute is provided to override that setting.
- The crlf attribute gets a new synonym "text" to avoid confusion.
There is also some change to the result of file type autodetection,
but as long as your .gitattributes uses '* crlf' or '* -crlf', there
is no need to worry about this.
Hope that helps,
Jonathan
next prev parent reply other threads:[~2010-05-14 4:57 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-12 23:00 [PATCH v3 0/5] End-of-line normalization, redesigned Eyvind Bernhardsen
2010-05-12 23:00 ` [PATCH v3 1/5] autocrlf: Make it work also for un-normalized repositories Eyvind Bernhardsen
2010-05-12 23:00 ` [PATCH v3 2/5] Add tests for per-repository eol normalization Eyvind Bernhardsen
2010-05-12 23:00 ` [PATCH v3 3/5] Add " Eyvind Bernhardsen
2010-05-12 23:00 ` [RFC/PATCH v3 4/5] Rename "crlf" attribute as "eolconv" Eyvind Bernhardsen
2010-05-13 1:38 ` Linus Torvalds
2010-05-13 9:39 ` Robert Buck
2010-05-13 9:58 ` Robert Buck
2010-05-13 11:47 ` Eyvind Bernhardsen
2010-05-13 13:19 ` Robert Buck
2010-05-14 10:16 ` utf8 BOM Dmitry Potapov
2010-05-15 20:23 ` Eyvind Bernhardsen
2010-05-16 5:19 ` Dmitry Potapov
2010-05-16 10:37 ` Eyvind Bernhardsen
2010-05-16 11:26 ` Tait
2010-05-16 13:32 ` Dmitry Potapov
2010-05-13 10:59 ` [RFC/PATCH v3 4/5] Rename "crlf" attribute as "eolconv" Eyvind Bernhardsen
2010-05-13 21:45 ` Linus Torvalds
2010-05-14 2:34 ` Robert Buck
2010-05-14 4:56 ` Jonathan Nieder [this message]
2010-05-14 21:21 ` Eyvind Bernhardsen
2010-05-14 21:32 ` Eyvind Bernhardsen
2010-05-14 21:16 ` Eyvind Bernhardsen
2010-05-14 21:27 ` Linus Torvalds
2010-05-15 20:47 ` [PATCH] Add "core.eol" variable to control end-of-line conversion Eyvind Bernhardsen
2010-05-16 10:39 ` Robert Buck
2010-05-12 23:00 ` [RFC/PATCH v3 5/5] Rename "core.autocrlf" config variable as "core.eolconv" 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=20100514045646.GA2433@progeny.tock \
--to=jrnieder@gmail.com \
--cc=buck.robert.j@gmail.com \
--cc=dpotapov@gmail.com \
--cc=eyvind.bernhardsen@gmail.com \
--cc=finnag@pvv.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@gmail.com \
--cc=msysgit@googlegroups.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).