All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Henrie <alexhenrie24@gmail.com>
To: "Tao Klerks" <tao@klerks.biz>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: "Torsten Bögershausen" <tboegi@web.de>,
	"Git mailing list" <git@vger.kernel.org>,
	"Junio C Hamano" <gitster@pobox.com>,
	prohaska@zib.de, eyvind.bernhardsen@gmail.com
Subject: Re: [PATCH v2] convert: clarify line ending conversion warning
Date: Wed, 6 Apr 2022 12:30:02 -0600	[thread overview]
Message-ID: <CAMMLpeRw2SMaPhesXn7Q5CGq2Kmk=eJrPBnFBnJex8-OvfSz5w@mail.gmail.com> (raw)
In-Reply-To: <CAPMMpohYRTSaTcRVTJ6y=Q7+FSOcSNjHjwDvUMhVv4JO7QDB_g@mail.gmail.com>

On Wed, Apr 6, 2022 at 12:18 PM Tao Klerks <tao@klerks.biz> wrote:
>
> On Wed, Apr 6, 2022 at 8:04 PM Torsten Bögershausen <tboegi@web.de> wrote:
>
> > May be we can use "updates" instead of "touches" ?
> >
> > "In '%s', CRLF will be replaced by LF the next time Git updates it"
>
> Makes sense to me.

I don't like this wording as much because "update" could more easily
be taken to mean something that happens in the index or in a commit,
not in the working directory. But maybe it needs more clarification
anyway, e.g. "In the working copy of '%s'..."

Ævar, would the phrase "In the working copy" resolve your concern
about the new message "[not offering] the working directory advice at
all"?

> > Or may be
> >
> > "In '%s', CRLF will be replaced by LF the next time a `git checkout` updates it"
> >
>
> I believe we should stay away from the word "checkout" because it's
> neither accurate nor clear, for at least a couple of reasons:
> 1. We have long, in principle, been promoting the use of "git switch",
> and it's not obvious in a message like this one that this is
> considered to be equivalent.
> 2. Files can be touched/updated by other commands/processes, like "git
> pull" (and "rebase", and probably others I can't think of)

I agree: Talking about the `git checkout` command is too specific.

-Alex

  reply	other threads:[~2022-04-06 19:40 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-05  5:35 [PATCH v2] convert: clarify line ending conversion warning Alex Henrie
2022-04-05  8:45 ` Ævar Arnfjörð Bjarmason
2022-04-05 16:44   ` Alex Henrie
2022-04-06 15:29     ` Junio C Hamano
2022-04-06 18:04 ` Torsten Bögershausen
2022-04-06 18:18   ` Tao Klerks
2022-04-06 18:30     ` Alex Henrie [this message]
2022-04-06 19:45     ` Junio C Hamano
2022-04-06 19:42   ` Junio C Hamano
2022-04-08  4:41 ` [PATCH v3] " Alex Henrie

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='CAMMLpeRw2SMaPhesXn7Q5CGq2Kmk=eJrPBnFBnJex8-OvfSz5w@mail.gmail.com' \
    --to=alexhenrie24@gmail.com \
    --cc=avarab@gmail.com \
    --cc=eyvind.bernhardsen@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=prohaska@zib.de \
    --cc=tao@klerks.biz \
    --cc=tboegi@web.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.