Jeff King <peff@xxxxxxxx> writes: > [+cc Junio, as this gets deep into git-apply innards] I've written off --recount and --allow-overlap as ugly workaround that happens to work some of the time but cannot be trusted long time ago. IIRC, before the "(e)dit" thing was added to "add -p", we counted the line numbers correctly and merged the adjacent hunks before applying and neither of these two kluge was necessary. These threads may give us a bit more background: https://public-inbox.org/git/7viqk1ndlk.fsf@xxxxxxxxxxxxxxxxxxxxxxxx/ https://public-inbox.org/git/1304117373-592-1-git-send-email-gitster@xxxxxxxxx/ The original that introduced the "(e)dit" thing was in this thread: https://public-inbox.org/git/200805232221.45406.trast@xxxxxxxxxxxxxxx/ As you can see, I was very much against it, as it cannot fundamentally sanely implemented (which I think is the same conclusion you reached at the end of the current thread). I think there should be a better failure mode, though.
