Merge branch 'jk/xdiff-clamp-funcname-context-index'
commitc3d4c20c7d862fb168b4b2126443e13c55737507
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:39:13 +0000 (29 12:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:39:13 +0000 (29 12:39 -0700)
tree99156760fb563a9de7cc1a3c52581cb2a5acfa0a
parent995ec8a18f60c23b80ae7ed84f8c921652a6ebb3
parentb777f3fd619ac2af507ffd3e7c5fe0d6e36e81f2
Merge branch 'jk/xdiff-clamp-funcname-context-index'

The internal diff machinery can be made to read out of bounds while
looking for --funcion-context line in a corner case, which has been
corrected.

* jk/xdiff-clamp-funcname-context-index:
  xdiff: clamp function context indices in post-image
t/t4015-diff-whitespace.sh