summaryrefslogtreecommitdiff
path: root/xdiff/xprepare.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2018-03-03 00:58:49 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-05 12:49:45 -0800
commit42f7d45428e260acf535ba0d55ecc91ee81e21da (patch)
treec2f3d0af9f1037c0f97bcaaa1c178caaeea43ffa /xdiff/xprepare.c
parentt3701: add a test for interactive.diffFilter (diff)
downloadtgif-42f7d45428e260acf535ba0d55ecc91ee81e21da.tar.xz
add--interactive: detect bogus diffFilter output
It's important that the diff-filter only filter the individual lines, and that there remain a one-to-one mapping between the input and output lines. Otherwise, things like hunk-splitting will behave quite unexpectedly (e.g., you think you are splitting at one point, but it has a different effect in the text patch we apply). We can't detect all problematic cases, but we can at least catch the obvious case where we don't even have the correct number of lines. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xprepare.c')
0 files changed, 0 insertions, 0 deletions