From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Git List <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Derrick Stolee <dstolee@microsoft.com>
Subject: Re: [PATCH 3/4] gitfaq: give advice on using eol attribute in gitattributes
Date: Thu, 21 Oct 2021 14:02:36 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2110211359410.56@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <YXCXU8uns1Xld5lH@camp.crustytoothpaste.net>
Hi brian,
On Wed, 20 Oct 2021, brian m. carlson wrote:
> On 2021-10-20 at 12:02:02, Johannes Schindelin wrote:
> > Hi brian,
> >
> > On Wed, 20 Oct 2021, brian m. carlson wrote:
> >
> > > On 2021-10-20 at 01:21:40, Eric Sunshine wrote:
> > > > On Tue, Oct 19, 2021 at 9:06 PM brian m. carlson
> > > > <sandals@crustytoothpaste.net> wrote:
> > > >
> > > > > diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
> > > > > @@ -464,14 +465,25 @@ references, URLs, and hashes stored in the repository.
> > > > > +With text files, Git will generally the repository contains LF endings in the
> > > > > +repository, and will honor `core.autocrlf` and `core.eol` to decide what options
> > > > > +to use when checking files out. You can also override this by specifying a
> > > > > +particular line ending such as `eol=lf` or `eol=crlf` if those files must always
> > > > > +have that ending (e.g., for functionality reasons).
> > > >
> > > > The first sentence in the paragraph is unparseable.
> > >
> > > Yes, I think perhaps I omitted the word "ensure".
> > >
> > > And I should reflect that they should have that ending in the working
> > > tree, which I neglected to mention.
> >
> > Please note that Git for Windows defaults to `core.autoCRLF=true`,
> > therefore this sentence is not completely correct. Maybe something as
> > short as "(except in Git for Windows, which defaults to CRLF endings)"
> > would suffice?
>
> What I meant by that sentence was that I should add, "in the working
> tree" to the sentence ending "if those files must always have that
> ending". I believe that is still the case for Git for Windows, since
> otherwise our shell files in the repository would be broken there, and
> I'm fairly confident they are not.
I swear I read this sentence multiple times yesterday, and still managed
to miss that you were talking about LF endings _in the repository_.
FWIW I think that `core.autoCRLF` defaults to `off` everywhere but on
Windows, so _technically_ Git would not ensure LF endings e.g. on Linux.
In practice, it is highly unlikely that a Linux user would generate text
files with CR/LF endings, so it would not matter in practice.
I feel a bit bad for arguing subtleties that realistically won't matter,
so please feel free to leave the sentence as you have intended it.
Ciao,
Dscho
next prev parent reply other threads:[~2021-10-21 12:03 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-20 1:06 [PATCH 0/4] Additional FAQ entries brian m. carlson
2021-10-20 1:06 ` [PATCH 1/4] gitfaq: add advice on monorepos brian m. carlson
2021-10-20 4:45 ` Bagas Sanjaya
2021-10-20 10:54 ` Ævar Arnfjörð Bjarmason
2021-10-20 21:19 ` brian m. carlson
2021-10-20 11:55 ` Johannes Schindelin
2021-10-20 14:11 ` Philip Oakley
2021-10-20 22:22 ` brian m. carlson
2021-10-25 10:44 ` Philip Oakley
2021-10-20 1:06 ` [PATCH 2/4] gitfaq: add documentation on proxies brian m. carlson
2021-10-20 11:57 ` Johannes Schindelin
2021-10-20 22:17 ` brian m. carlson
2021-10-20 14:48 ` Junio C Hamano
2021-10-20 22:19 ` brian m. carlson
2021-10-20 1:06 ` [PATCH 3/4] gitfaq: give advice on using eol attribute in gitattributes brian m. carlson
2021-10-20 1:21 ` Eric Sunshine
2021-10-20 1:27 ` brian m. carlson
2021-10-20 12:02 ` Johannes Schindelin
2021-10-20 22:25 ` brian m. carlson
2021-10-21 12:02 ` Johannes Schindelin [this message]
2021-10-20 1:06 ` [PATCH 4/4] doc: add a FAQ entry about syncing working trees brian m. carlson
2021-10-20 4:58 ` Bagas Sanjaya
2021-10-20 14:05 ` Philip Oakley
2021-10-20 23:35 ` Ævar Arnfjörð Bjarmason
2021-10-21 0:03 ` brian m. carlson
2021-10-21 0:33 ` Ævar Arnfjörð Bjarmason
2021-10-20 1:06 ` [PATCH 4/4] gitfaq: add " brian m. carlson
2021-10-20 1:38 ` Eric Sunshine
2021-10-20 21:36 ` brian m. carlson
2021-10-20 12:09 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2110211359410.56@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).