git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Taylor Blau <me@ttaylorr.com>
To: "Peregi Tamás" <petamas@gmail.com>
Cc: git@vger.kernel.org, "Elijah Newren" <newren@gmail.com>,
	"Patrick Steinhardt" <ps@pks.im>, "Jeff King" <peff@peff.net>,
	"René Scharfe" <l.s.r@web.de>
Subject: Re: Inconsistent handling of corrupt patches based on line endings
Date: Mon, 28 Oct 2024 14:11:14 -0400	[thread overview]
Message-ID: <Zx/TwhuG4Ni7mf6F@nand.local> (raw)
In-Reply-To: <CAExmRTbMCayh+vHW3g=2p=FMb=VKXomEbn7_0t+kK-eF79JnEA@mail.gmail.com>

On Mon, Oct 28, 2024 at 05:57:54PM +0100, Peregi Tamás wrote:
> Hi all,
>
> I might've found an inconsistency in how git-apply treats corrupt patches
> (representing empty context lines with completely empty lines instead of
> lines containing a single space - usually a result of a "trim trailing
> whitespace" editor setting) based on whether the patch file uses
> Windows-style line endings (CRLF) or Unix-style line endings (LF only).

Let's see if any recent apply.c folks have thoughts...:

$ git shortlog -nse --no-merges --since=3.years.ago.. -- apply.c
    21  Elijah Newren <newren@gmail.com>
    12  Patrick Steinhardt <ps@pks.im>
     7  Ævar Arnfjörð Bjarmason <avarab@gmail.com>
     5  Junio C Hamano <gitster@pobox.com>
     4  Jeff King <peff@peff.net>
     4  René Scharfe <l.s.r@web.de>

Thanks,
Taylor

  reply	other threads:[~2024-10-28 18:11 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-28 16:57 Inconsistent handling of corrupt patches based on line endings Peregi Tamás
2024-10-28 18:11 ` Taylor Blau [this message]
2024-10-28 18:39   ` Elijah Newren
2024-10-28 22:07     ` René Scharfe
2024-10-28 22:59       ` Junio C Hamano
2024-10-29 16:32 ` Torsten Bögershausen

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=Zx/TwhuG4Ni7mf6F@nand.local \
    --to=me@ttaylorr.com \
    --cc=git@vger.kernel.org \
    --cc=l.s.r@web.de \
    --cc=newren@gmail.com \
    --cc=peff@peff.net \
    --cc=petamas@gmail.com \
    --cc=ps@pks.im \
    /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 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 NNTP newsgroup(s).