From: Jeff King <peff@peff.net>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Chris Harris <ryguasu@gmail.com>, git@vger.kernel.org
Subject: Re: Is the "text" attribute meant *only* to specify end-of-line normalization behavior, or does it have broader implications?
Date: Fri, 30 Mar 2012 03:25:46 -0400 [thread overview]
Message-ID: <20120330072546.GC30656@sigill.intra.peff.net> (raw)
In-Reply-To: <4F7555BC.1000804@viscovery.net>
On Fri, Mar 30, 2012 at 08:42:04AM +0200, Johannes Sixt wrote:
> Am 3/30/2012 4:19, schrieb Chris Harris:
> > I'm starting a new repository for a Windows-only project where I don't
> > think I want git to do any end-of-line normalization on my text files.
> > (I'm totally happy to have CRLFs both in the repo and in all the
> > working copies.)
>
> The question is rather: Are you happy if someone commits a file that does
> *not* have CRLF, but only LF?
>
> Because if you don't care, you are better off setting no attributes and no
> core.autocrlf and no core.eol at all. The git will take the file
> unmodified. If someone's editor changes the eol style of a file, it will
> be noticed because the diff will show that the entire file has changed.
> Your team mates should better have enough discipline not to ignore such a
> hint that something's gone awry, of course.
I think it may be slightly more complex than that. He may be OK with
"git does nothing" and assuming everybody's editor does the sane thing.
But he may _not_ be OK with a stray core.autocrlf setting in a project
member's git config normalizing all line endings whenever they touch a
file. Setting "-text" prevents the latter.
> (I didn't answer the question in the subject of your message, and I can't;
> I don't use the text attribute nor eol normalization, even though I work
> on Windows quite a lot.)
I don't use them either.
However, I find the behavior of "Git Extensions" to be questionable. I
can see the rationale for thinking that "-text" means more than just
handling line-endings, but I think "-diff" is probably a better choice
for seeing if something is binary (or even checking the "binary" macro).
Those are what git uses itself.
Perhaps it was a mistake to call it "text", as it invites this sort of
confusion.
-Peff
PS I think one could potentially work around the whole issue by setting
"-crlf", which git treats equivalently to "-text" these days (and
hopefully isn't also checked by Git Extensions).
next prev parent reply other threads:[~2012-03-30 7:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-30 2:19 Is the "text" attribute meant *only* to specify end-of-line normalization behavior, or does it have broader implications? Chris Harris
2012-03-30 6:42 ` Johannes Sixt
2012-03-30 7:25 ` Jeff King [this message]
2012-03-30 17:49 ` Chris Harris
2012-03-30 18:22 ` Junio C Hamano
2012-03-30 21:30 ` Jeff King
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=20120330072546.GC30656@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=ryguasu@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.
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).