Re: [PATCH 0/4] demonstrate add -p and stash -p failures.

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 14, 2015, 18:00 UTC
Message-ID: <xmqqbniq3803.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1429011168-23216-1-git-send-email-Matthieu.Moy@imag.fr>

Matthieu Moy <Matthieu.Moy@imag.fr> writes:

Show 5 quoted lines

> 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 ;-).