From: Amit Choudhary <amitchoudhary2305@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Linus Torvalds" <torvalds@linux-foundation.org>,
"Jonathan Corbet" <corbet@lwn.net>,
"Git List Mailing" <git@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
"open list:DOCUMENTATION" <linux-doc@vger.kernel.org>,
"Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
Subject: Re: [PATCH] Documentation: networking: device drivers: Remove stray asterisks
Date: Mon, 2 Dec 2019 15:20:08 +0530 [thread overview]
Message-ID: <CAFzckaEQo6CQM9LukikgbtUKZX=eajG+OFNhnDJ_EY7M1V4XKA@mail.gmail.com> (raw)
In-Reply-To: <xmqq7e3g12xo.fsf@gitster-ct.c.googlers.com>
Is it possible that git complains about everything that has ^M in it
and rejects it (that is without trying to fix it, etc.)
Regards,
Amit
On Sun, Dec 1, 2019 at 8:58 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Linus Torvalds <torvalds@linux-foundation.org> writes:
>
> > On Sat, Nov 30, 2019 at 10:35 PM Junio C Hamano <gitster@pobox.com> wrote:
> >>
> >> OK, so it appears that the tool is working as documented.
> >
> > Well, yes and no.
> >
> > I think it's a mistake that --no-keep-cr (which is the default) only
> > acts on the outer envelope.
> >
> > Now, *originally* the outer envelope was all that existed so it makes
> > sense in a historical context of "CR removal happens when splitting
> > emails in an mbox". And that's the behavior we have.
>
> Hmph, first of all, the one I was referring to as "documented" was
> about --ignore-whitespace, and not --no-keep-cr.
>
> And I am not as sure as you seem to be about "--no-keep-cr" either.
>
> What was the reason why "--no-keep-cr" was invented and made
> default? Wasn't it because RFC says that each line of plaintext
> transfer of an e-mail is terminated with CRLF? It would mean that,
> whether the payload originally had CRLF terminated or LF terminated,
> we would not be able to tell---the CR may have been there from the
> beginning, or it could have been added in transit. And because we
> (the projects Git was originally designed to serve well) wanted our
> patches with LF terminated lines most of the time, it made sense to
> strip CR from CRLF (i.e. assuming that it would be rare that the
> sender wants to transmit CRLF terminated lines).
>
> If the contents were base64 protected from getting munged during
> transit, we _know_ CRLF in the payload after we decode MIME is what
> the sender _meant_ to give us, no? Which leads me to say ...
>
> >
> > But then git learnt to do MIME decoding and extracting things from
> > base64 etc, and the CR removal wasn't updated to that change.
>
> ... I do not think it was a wrong decision (well, I do not think we
> made the conscious decision to do so, though) not to do that update.
>
> I dunno.
>
next prev parent reply other threads:[~2019-12-02 9:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-01 1:03 Fw: [PATCH] Documentation: networking: device drivers: Remove stray asterisks Jonathan Corbet
2019-12-01 1:20 ` Linus Torvalds
2019-12-01 1:45 ` Jonathan Corbet
2019-12-01 6:35 ` Junio C Hamano
2019-12-01 14:28 ` Linus Torvalds
2019-12-01 15:27 ` Junio C Hamano
2019-12-02 9:50 ` Amit Choudhary [this message]
2019-12-02 14:22 ` Junio C Hamano
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='CAFzckaEQo6CQM9LukikgbtUKZX=eajG+OFNhnDJ_EY7M1V4XKA@mail.gmail.com' \
--to=amitchoudhary2305@gmail.com \
--cc=corbet@lwn.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.neuschaefer@gmx.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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.
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).