Merge branch 'ab/pcre-v2'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:14:34 +0000 (12:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:14:34 +0000 (12:14 +0900)
commit2620b47794e3238ee5c7dd6b8a38f58732ace3a2
tree5dad7d6e3d92d164f82f8bbe886ef000fa4f6d9d
parentf13b8ec25e3171301c50146f559170a6756efb53
parent2fff1e196d9cf03a868e99da39ea21b7c18c65c5
Merge branch 'ab/pcre-v2'

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