Merge branch 'bb/grep-pcre2-bug-message-fix'

gitster · gitster · commit 7b70d46ca410 · 2019-07-29T12:39:13.000-07:00
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
diff --git 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);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ static void compile_pcre2_pattern(struct grep_pat p, const struct grep_opt opt`
`559`	`559`	`pcre2_jit_stack_assign(p->pcre2_match_context, NULL, p->pcre2_jit_stack);`
`560`	`560`	`} else if (p->pcre2_jit_on != 0) {`
`561`	`561`	`BUG("The pcre2_jit_on variable should be 0 or 1, not %d",`
`562`		`- p->pcre1_jit_on);`
	`562`	`+ p->pcre2_jit_on);`
`563`	`563`	`}`
`564`	`564`	`}`
`565`	`565`