summaryrefslogtreecommitdiff
path: root/contrib/subtree/git-subtree.txt
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2018-03-01 10:50:59 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-01 11:39:15 -0800
commit23fea4c240218d519da01e6d2d64264084a7334c (patch)
treed43cb77dc92f0dbe857cc87bff9e46011b106f04 /contrib/subtree/git-subtree.txt
parentt3701: don't hard code sha1 hash values (diff)
downloadtgif-23fea4c240218d519da01e6d2d64264084a7334c.tar.xz
t3701: add failing test for pathological context lines
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 hunks following an edited hunk that has had the number of insertions or deletions changed also need to be updated in the same way. Add failing tests to demonstrate this. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/subtree/git-subtree.txt')
0 files changed, 0 insertions, 0 deletions