]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4d8ec15 b777f3f)
Merge branch 'jk/xdiff-clamp-funcname-context-index' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Aug 2019 22:18:18 +0000 (15:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Aug 2019 22:18:18 +0000 (15:18 -0700)
commitae76814c6ca1af63f947c3525dfd1a799c3d9fd4
tree1b37970c2a541ad4550465061efc718e83e5e354tree | snapshot
parent4d8ec15c66f32e29e4dfcdf64d0826c425d8ad7dcommit | diff
parentb777f3fd619ac2af507ffd3e7c5fe0d6e36e81f2commit | 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
t/t4015-diff-whitespace.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.