Re: [RFC] solving a bug with hunks starting at line 1 in git apply

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 1, 2015, 18:37 UTC
Message-ID: <xmqqpp5f5l7v.fsf@gitster.dls.corp.google.com>
In-Reply-To: <vpqa8wj48c1.fsf@anie.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

Show 18 quoted lines

>> @@ -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?