Re: [PATCH 2/4] t3701: add failing test for pathological context lines

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 13, 2018, 20:35 UTC
Message-ID: <xmqqr2popqzx.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180213104408.9887-3-phillip.wood@talktalk.net>

Phillip Wood <phillip.wood@talktalk.net> writes:

Show 8 quoted lines

> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> When a hunk is skipped by add -i the offsets of subsequent hunks are
> not adjusted to account for any missing insertions due to the skipped
> hunk. Most of the time this does not matter as apply uses the context
> lines to apply the subsequent hunks in the correct place, however in
> pathological cases the context lines will match at the now incorrect
> offset and the hunk will be applied in the wrong place. The offsets of

Good. The --recount "feature" on the receiving end does not have enough information to do a job as good as the code sitting at the side of producing a patch to be applied, and this goes in the right direction.