diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-08-09 15:18:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-09 15:18:18 -0700 |
| commit | ae76814c6ca1af63f947c3525dfd1a799c3d9fd4 (patch) | |
| tree | 1b37970c2a541ad4550465061efc718e83e5e354 /builtin/commit.c | |
| parent | 4d8ec15c66f32e29e4dfcdf64d0826c425d8ad7d (diff) | |
| parent | b777f3fd619ac2af507ffd3e7c5fe0d6e36e81f2 (diff) | |
Merge branch 'jk/xdiff-clamp-funcname-context-index' into maint
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/commit.c')
0 files changed, 0 insertions, 0 deletions