aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-29 12:39:13 -0700
committerJunio C Hamano <gitster@pobox.com>2019-07-29 12:39:13 -0700
commit7b70d46ca410f9d37045558329c3143570d47ba6 (patch)
tree9cce268066748b8d79bc0986244459f692ef4439
parentSync with maint (diff)
parentgrep: print the pcre2_jit_on value (diff)
downloadgit-7b70d46ca410f9d37045558329c3143570d47ba6.tar.gz
git-7b70d46ca410f9d37045558329c3143570d47ba6.zip
Merge branch 'bb/grep-pcre2-bug-message-fix'
BUG() message fix. The codepath may want to just simply be removed, though. * bb/grep-pcre2-bug-message-fix: grep: print the pcre2_jit_on value
-rw-r--r--grep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/grep.c b/grep.c
index f7c3a5803e..cd952ef5d3 100644
--- a/grep.c
+++ b/grep.c
@@ -559,7 +559,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
pcre2_jit_stack_assign(p->pcre2_match_context, NULL, p->pcre2_jit_stack);
} else if (p->pcre2_jit_on != 0) {
BUG("The pcre2_jit_on variable should be 0 or 1, not %d",
- p->pcre1_jit_on);
+ p->pcre2_jit_on);
}
}