git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Corbet <corbet@lwn.net>
Cc: "Linus Torvalds" <torvalds@linux-foundation.org>,
	"Git List Mailing" <git@vger.kernel.org>,
	"Junio Hamano C" <gitster@pobox.com>,
	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: Sat, 30 Nov 2019 22:35:54 -0800	[thread overview]
Message-ID: <xmqqblss1rjp.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20191130184512.23c6faaa@lwn.net> (Jonathan Corbet's message of "Sat, 30 Nov 2019 18:45:12 -0700")

Jonathan Corbet <corbet@lwn.net> writes:

> On Sat, 30 Nov 2019 17:20:10 -0800
> Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
>> Do you use some special options for git? Like --whitespace=nowarn or
>> --3way or something like that?
>
> Sigh, that has to be it.  I have --ignore-whitespace in my script. When I
> take that option out, the patch in question no longer applies.

OK, so it appears that the tool is working as documented.  The
"ignore" stuff kicks in to fuzz the whitespace difference for the '
' lines and '-' lines, but the option itself does not give "git
apply" enough information to decide what to do with the extra
whitespace that is CR at the end of the line on the '+' lines.

I would also say it is doubtful that it is working as expected.
Perhaps --ignore-whitespace and --whitespace=fix ought to work well
together to allow matching preimage (i.e. ' ' and '-') lines, but
still fix whitespace-broken material in postimage (i.e.  ' ' and
'+') lines before replacing the preimage with the postimage, or
something along that line?




  reply	other threads:[~2019-12-01  6:36 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 [this message]
2019-12-01 14:28       ` Linus Torvalds
2019-12-01 15:27         ` Junio C Hamano
2019-12-02  9:50           ` Amit Choudhary
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=xmqqblss1rjp.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=corbet@lwn.net \
    --cc=git@vger.kernel.org \
    --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).