From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 19:39:13 +0000 (-0700)
Subject: Merge branch 'bb/grep-pcre2-bug-message-fix'
X-Git-Tag: v2.23.0-rc0~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7b70d46ca410f9d37045558329c3143570d47ba6?ds=inline;hp=-c

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
---

7b70d46ca410f9d37045558329c3143570d47ba6
diff --combined grep.c
index f7c3a5803e,c2bce6c2c7..cd952ef5d3
--- a/grep.c
+++ b/grep.c
@@@ -559,7 -559,7 +559,7 @@@ static void compile_pcre2_pattern(struc
  		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);
  	}
  }
  
@@@ -1780,10 -1780,6 +1780,10 @@@ static int grep_source_1(struct grep_op
  	enum grep_context ctx = GREP_CONTEXT_HEAD;
  	xdemitconf_t xecfg;
  
 +	if (!opt->status_only && gs->name == NULL)
 +		BUG("grep call which could print a name requires "
 +		    "grep_source.name be non-NULL");
 +
  	if (!opt->output)
  		opt->output = std_output;
  
@@@ -1809,7 -1805,7 +1809,7 @@@
  		 * is not thread-safe.
  		 */
  		grep_attr_lock();
 -		textconv = userdiff_get_textconv(gs->driver);
 +		textconv = userdiff_get_textconv(opt->repo, gs->driver);
  		grep_attr_unlock();
  	}