summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:36 (GMT)
commit2f4af84578ab3302ba188a86e75743cafc23d300 (patch)
tree05633bd8faa5961f61a76f1dcd6ccb53866079f4
parent6bbd512374133ff3c1c6b17e080a466b6485ed42 (diff)
parent674ad936bb40332e016b60c59d1982c832338493 (diff)
downloadgit-2f4af84578ab3302ba188a86e75743cafc23d300.zip
git-2f4af84578ab3302ba188a86e75743cafc23d300.tar.gz
git-2f4af84578ab3302ba188a86e75743cafc23d300.tar.bz2
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
-rw-r--r--grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/grep.c b/grep.c
index d7ef213..06c4c24 100644
--- a/grep.c
+++ b/grep.c
@@ -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) {