]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/pcre-v2'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Jun 2017 19:38:43 +0000 (12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Jun 2017 19:38:43 +0000 (12:38 -0700)
Update "perl-compatible regular expression" support to enable JIT
and also allow linking with the newer PCRE v2 library.

* ab/pcre-v2:
  grep: add support for PCRE v2
  grep: un-break building with PCRE >= 8.32 without --enable-jit
  grep: un-break building with PCRE < 8.20
  grep: un-break building with PCRE < 8.32
  grep: add support for the PCRE v1 JIT API
  log: add -P as a synonym for --perl-regexp
  grep: skip pthreads overhead when using one thread
  grep: don't redundantly compile throwaway patterns under threading

1  2 
Makefile
builtin/grep.c
config.mak.uname
revision.c
t/t4202-log.sh
t/test-lib.sh

diff --cc Makefile
Simple merge
diff --cc builtin/grep.c
Simple merge
Simple merge
diff --cc revision.c
Simple merge
diff --cc t/t4202-log.sh
Simple merge
diff --cc t/test-lib.sh
Simple merge