Merge branch 'ah/doc-submodule-ignore-submodules'

[thirdparty/git.git] / grep.c

diff --git a/grep.c b/grep.c
index f7c3a5803e8ea0bf2c609e9eeec6764217641cfc..9dd290809e6abf6dbc358c0820d1a056170eff3b 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -421,7 +421,7 @@ static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt)
 static int pcre1match(struct grep_pat *p, const char *line, const char *eol,
                regmatch_t *match, int eflags)
 {
-       int ovector[30], ret, flags = 0;
+       int ovector[30], ret, flags = PCRE_NO_UTF8_CHECK;
 
        if (eflags & REG_NOTBOL)
                flags |= PCRE_NOTBOL;
@@ -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);
        }
 }