linux-kernel - Re: [PATCH] Documentation: networking: device drivers: Remove stray asterisks

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <xmqqblss1rjp.fsf@gitster-ct.c.googlers.com>
Date:   Sat, 30 Nov 2019 22:35:54 -0800
From:   Junio C Hamano <gitster@...ox.com>
To:     Jonathan Corbet <corbet@....net>
Cc:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Git List Mailing <git@...r.kernel.org>,
        Junio Hamano C <gitster@...ox.com>,
        LKML <linux-kernel@...r.kernel.org>,
        "open list\:DOCUMENTATION" <linux-doc@...r.kernel.org>,
        Jonathan Neuschäfer <j.neuschaefer@....net>
Subject: Re: [PATCH] Documentation: networking: device drivers: Remove stray asterisks

Jonathan Corbet <corbet@....net> writes:

> On Sat, 30 Nov 2019 17:20:10 -0800
> Linus Torvalds <torvalds@...ux-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?