diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-06-12 02:25:27 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-06-13 10:00:30 -0700 |
| commit | 2bd69b9024c8c7c1b77060e3ed996c74b4775b01 (patch) | |
| tree | 7934b95217df177127b0167fd5912530403bfa0f /t/t5536-fetch-conflicts.sh | |
| parent | add -p: fix counting empty context lines in edited patches (diff) | |
| download | tgif-2bd69b9024c8c7c1b77060e3ed996c74b4775b01.tar.xz | |
add -p: fix checkout -p with pathological context
Commit fecc6f3a68 ("add -p: adjust offsets of subsequent hunks when one is
skipped", 2018-03-01) fixed adding hunks in the correct place when a
previous hunk has been skipped. However it did not address patches that
are applied in reverse. In that case we need to adjust the pre-image
offset so that when apply reverses the patch the post-image offset is
adjusted correctly. We subtract rather than add the delta as the patch
is reversed (the easiest way to think about it is to consider a hunk of
deletions that is skipped - in that case we want to reduce offset so we
need to subtract).
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5536-fetch-conflicts.sh')
0 files changed, 0 insertions, 0 deletions