git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] convert: clarify line ending conversion warning

From
Alex Henrie <alexhenrie24@gmail.com>
Date
Apr 4, 2022, 17:23 UTC
Message-ID
<CAMMLpeRQm=PwvmvEWy387oFsjQXNgPnbgqSnre8Hz7iLJxPM_g@mail.gmail.com>
In-Reply-To
<CAPMMpohXLG2BsO2N1He9aBxm_VuQGCtf32AC67jVkuHQnwVw8A@mail.gmail.com>
On Mon, Apr 4, 2022 at 9:22 AM Tao Klerks <tao@klerks.biz> wrote:
Show 30 quoted lines
>
> On Mon, Apr 4, 2022 at 7:52 AM Alex Henrie <alexhenrie24@gmail.com> wrote:
> >
> > The warning about converting line endings is extremely confusing. Its
> > two sentences each use the word "will" without specifying a timeframe,
> > which makes it sound like both sentences are referring to the same
> > timeframe. On top of that, it uses the term "original line endings"
> > without saying whether "original" means LF or CRLF.
> >
> > Rephrase the warning to be clear that line endings have not been changed
> > in the working directory but will be changed on the next checkout, and
> > explicitly say which line endings the file currently has in the working
> > directory.
> >
>
> I think this change is generally a great idea (I agree the existing
> message is confusing / not as helpful as it could be).
>
> I think we could do slightly better than "the next time you check it
> out", however, in terms of clarity. I just tested and the way I
> personally would inelegantly describe it is "the next time you switch
> to, merge in, or rebase a branch that has different content for this
> file, or explicitly check the file out". I understand "check it out"
> is probably technically correct, but as a user, I'm left wondering
> whether that's the next time I check it out from scratch (i.e., switch
> to a branch that does not have the file, and then switch back - which,
> incidentally, is what I originally *assumed* would happen before your
> patch - I had never checked), or the next time I switch branches at
> all, or the next time I switch to (/merge in /rebase onto) a branch
> that has different content for that *specific file*.

I would prefer a short message to a long-winded one. How about "the next time Git touches it"?

-Alex
Previous: Tao KlerksNext: Tao Klerks
Message 4 of 8 in “convert: clarify line ending conversion warning”
  1. convert: clarify line ending conversion warningAlex Henrie, Apr 4, 2022
  2. Ævar Arnfjörð BjarmasonApr 4, 2022
  3. Tao KlerksApr 4, 2022
  4. Alex HenrieApr 4, 2022
  5. Tao KlerksApr 5, 2022
  6. Junio C HamanoApr 4, 2022
  7. Alex HenrieApr 4, 2022
  8. Junio C HamanoApr 4, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.