diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-19 12:38:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-19 12:38:43 -0700 |
| commit | ae7e4d4fedc2237217a9f802eba4ded9ea66bb91 (patch) | |
| tree | 6a10111b07939e0013082185ad4d5d471822bf03 /revision.c | |
| parent | 32e0da583f70fe1406268217befd61e3f515505f (diff) | |
| parent | 94da9193a6eb8f1085d611c04ff8bbb4f5ae1e0a (diff) | |
| download | git-ae7e4d4fedc2237217a9f802eba4ded9ea66bb91.tar.gz | |
Merge branch 'ab/pcre-v2'
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
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c index f88c14bab3..3b09cd6ee9 100644 --- a/revision.c +++ b/revision.c @@ -2031,7 +2031,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE); } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) { revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED; - } else if (!strcmp(arg, "--perl-regexp")) { + } else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) { revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE; } else if (!strcmp(arg, "--all-match")) { revs->grep_filter.all_match = 1; |