Merge branch 'ab/pcre-v2' into maint
commit8e3e51a3a791074110ab1946d8da3430c65d435c
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Nov 2017 05:05:30 +0000 (21 14:05 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Nov 2017 05:05:30 +0000 (21 14:05 +0900)
treebe2ded3ce4fa8c2f2bf689e9beb5e550578c4e6e
parentb77b96e29b9429a6cf10dd6fad15f9a220977029
parent2fff1e196d9cf03a868e99da39ea21b7c18c65c5
Merge branch 'ab/pcre-v2' into maint

Building with NO_LIBPCRE1_JIT did not disable it, which has been fixed.

* ab/pcre-v2:
  grep: fix NO_LIBPCRE1_JIT to fully disable JIT
grep.c
grep.h