diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:36 -0700 |
| commit | 2f4af84578ab3302ba188a86e75743cafc23d300 (patch) | |
| tree | 05633bd8faa5961f61a76f1dcd6ccb53866079f4 /grep.c | |
| parent | Merge branch 'da/mergetools-meld-output-opt-on-macos' (diff) | |
| parent | grep: fix erroneously copy/pasted variable in check/assert pattern (diff) | |
| download | git-2f4af84578ab3302ba188a86e75743cafc23d300.tar.gz git-2f4af84578ab3302ba188a86e75743cafc23d300.zip | |
Merge branch 'ab/pcre-v2'
Hotfix for a topic already in 'master'.
* ab/pcre-v2:
grep: fix erroneously copy/pasted variable in check/assert pattern
Diffstat (limited to 'grep.c')
| -rw-r--r-- | grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -508,7 +508,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt if (!p->pcre2_jit_stack) die("Couldn't allocate PCRE2 JIT stack"); p->pcre2_match_context = pcre2_match_context_create(NULL); - if (!p->pcre2_jit_stack) + if (!p->pcre2_match_context) die("Couldn't allocate PCRE2 match context"); pcre2_jit_stack_assign(p->pcre2_match_context, NULL, p->pcre2_jit_stack); } else if (p->pcre2_jit_on != 0) { |