Remi LESPINET <remi.lespinet@xxxxxxxxxxxxxxxxxxxxxxx> writes: > ====================================================================== > = 2. Correction > ====================================================================== > > I see mainly two ways to fix the bug: > > ******************************************************************** > * 2.1 first method (the most basic) > ******************************************************************** > > The most basic is to change the code so that the special behavior > only affects the hunks of the form > > @@ -1,k +1,m @@ I do not think that this would work in all cases. It seems git apply has issues with overlapping contexts, not just with hunks starting at line 1. See: $ cat pre.txt -1 0 10 20 30 40 $ cat p2.diff --- pre.txt +++ pre.txt @@ -2,2 +2,3 @@ 0 +5 10 @@ -3,3 +4,3 @@ 10 +15 -20 30 $ git apply p2.diff error: patch failed: pre.txt:3 error: pre.txt: patch does not apply $ patch < p2.diff patching file pre.txt $ cat pre.txt -1 0 5 10 15 30 40 -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html