Matthieu Moy <matthieu....@imag.fr> writes: > Playing a bit with add -p and stash -p, I can confirm the bug reported > by Tanky. This series just adds failing tests, but I couldn't debug it. > > I've exhausted my Git time budget for now, so if someone wants to take > over and fix the bugs, feel free to do it!
I do not have time to dig this either for now, but I suspect this "split a hunk into two overlapping hunks" issue may be related to the caveat in the very original: http://thread.gmane.org/gmane.comp.version-control.git/76650/focus=87197 where I seem to have said that the proposed change would make "add -p" less robust than the original code (even without 'e'dit): Junio C Hamano wrote: > > I recall that the original "add--interactive" carefully counted > numbers in hunks it reassembles (as it can let you split and then > you can choose to use both parts, which requires it to merge > overlapping hunks back), but if you are going to use --recount > anyway, perhaps we can discard that logic? It may make the patch > application less robust, though. I dunno. It seems that we accepted that series saying "let's see what happens" at the end, and I suspect we are seeing its consequences ;-). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
