From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mon, 01 Jun 2015 18:00:46 GMT
Subject: Re: [RFC] solving a bug with hunks starting at line 1 in git apply
Message-ID: <vpqa8wj48c1.fsf@anie.imag.fr>
In-Reply-To: <xmqqiob773iy.fsf@gitster.dls.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

> Remi LESPINET <remi.lespinet@ensimag.grenoble-inp.fr> writes:
>
>> first original file:
>>
>> 10
>> 20
>> 30
>> 40
>>
>> for the following diff file:
>>
>> @@ -1,2 +1,2 @@
>>  20
>> -30
>> +35
>>  40
>>
>> The patch will not be applied with a git apply command, but it will
>> with a basic patch command.
>
> Doesn't that merely indicate a bug in "patch", though?

No, it's just that patch does a fuzzy match in this case:

$ patch < patch.diff 
patching file pre.txt
Hunk #1 succeeded at 2 with fuzz 1 (offset 1 line).

It's different from the other case:

Remi LESPINET <remi.lespinet@ensimag.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.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/