From: Junio C Hamano <gitster@pobox.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Remi LESPINET <remi.lespinet@ensimag.grenoble-inp.fr>,
git@vger.kernel.org
Subject: Re: [RFC] solving a bug with hunks starting at line 1 in git apply
Date: Mon, 01 Jun 2015 11:37:08 -0700 [thread overview]
Message-ID: <xmqqpp5f5l7v.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <vpqa8wj48c1.fsf@anie.imag.fr> (Matthieu Moy's message of "Mon, 01 Jun 2015 20:00:46 +0200")
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>> @@ -1,1 +1,2 @@
>> +5
>> 10
>> @@ -1,3 +2,3 @@
>> 10
>> +15
>> -20
>> 30
>
> With this one, I get:
>
> $ git apply < p2.diff
> error: patch failed: pre.txt:1
> error: pre.txt: patch does not apply
> $ patch < p2.diff
> patching file pre.txt
>
> => no fuzzy matching for patch, git apply should actually work.
I am not sure what you are trying to do with that patch that tries
to touch the same line twice. Is this the same old laziness coming
back to bite us, the one that we attempted to work around with
933e44d3 ("add -p": work-around an old laziness that does not
coalesce hunks, 2011-04-06)?
In other words, isn't the right fix to coalesce that input, so that
the second hunk does *not* require fuzzy application in the first
place?
next prev parent reply other threads:[~2015-06-01 18:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 17:07 [RFC] solving a bug with hunks starting at line 1 in git apply Remi LESPINET
2015-06-01 17:16 ` Junio C Hamano
2015-06-01 17:30 ` Junio C Hamano
2015-06-01 18:00 ` Matthieu Moy
2015-06-01 18:37 ` Junio C Hamano [this message]
2015-06-01 18:47 ` Matthieu Moy
2015-06-01 18:53 ` Junio C Hamano
2015-06-01 21:37 ` Remi Lespinet
2015-06-01 18:20 ` Matthieu Moy
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=xmqqpp5f5l7v.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
/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