Merge branch 'js/regexec-buf' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Mar 2017 21:03:24 +0000 (14:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Mar 2017 21:03:24 +0000 (14:03 -0700)
commit7381595eb7ac77ab292f1fc9633ed26c96b7546f
tree9567fdcf61adcf452eff273c53ef187e72ac98c7
parent62119fa31433015d61f14d106cb159a0e84c5ab5
parentf53c5de29cec68e3294a008052251631eaffcf07
Merge branch 'js/regexec-buf' into next

Fix for potential segv introduced in v2.11.0 and later (also
v2.10.2).

* js/regexec-buf:
  pickaxe: fix segfault with '-S<...> --pickaxe-regex'
diffcore-pickaxe.c