summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-29 12:39:13 -0700
committerJunio C Hamano <gitster@pobox.com>2019-07-29 12:39:13 -0700
commitc3d4c20c7d862fb168b4b2126443e13c55737507 (patch)
tree99156760fb563a9de7cc1a3c52581cb2a5acfa0a /git.c
parent995ec8a18f60c23b80ae7ed84f8c921652a6ebb3 (diff)
parentb777f3fd619ac2af507ffd3e7c5fe0d6e36e81f2 (diff)
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
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions