Merge branch 'ab/pcre2-grep'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Dec 2017 21:28:54 +0000 (13:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Dec 2017 21:28:54 +0000 (13:28 -0800)
"git grep" compiled with libpcre2 sometimes triggered a segfault,
which is being fixed.

* ab/pcre2-grep:
grep: fix segfault under -P + PCRE2 <=10.30 + (*NO_JIT)
test-lib: add LIBPCRE1 & LIBPCRE2 prerequisites

1  2 
grep.c
t/t7810-grep.sh
diff --cc grep.c
Simple merge
diff --cc t/t7810-grep.sh
Simple merge