diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:39:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:39:13 -0700 |
| commit | c3d4c20c7d862fb168b4b2126443e13c55737507 (patch) | |
| tree | 99156760fb563a9de7cc1a3c52581cb2a5acfa0a /builtin/rebase.c | |
| parent | Merge branch 'sg/travis-gcc-4.8' (diff) | |
| parent | xdiff: clamp function context indices in post-image (diff) | |
| download | tgif-c3d4c20c7d862fb168b4b2126443e13c55737507.tar.xz | |
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 'builtin/rebase.c')
0 files changed, 0 insertions, 0 deletions