From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri, 26 Jul 2019 15:08:14 +0000 (+0200)
Subject: grep: consistently use "p->fixed" in compile_regexp()
X-Git-Tag: v2.24.0-rc0~37^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a35b540a99d909ee4680e773c1d3befb6bff782;p=git

grep: consistently use "p->fixed" in compile_regexp()

At the start of this function we do:

    p->fixed = opt->fixed;

It's less confusing to use that variable consistently that switch back
& forth between the two.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/grep.c b/grep.c
index 9c2b259771..b94e998680 100644
--- a/grep.c
+++ b/grep.c
@@ -616,7 +616,7 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
 		die(_("given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2"));
 
 	pat_is_fixed = is_fixed(p->pattern, p->patternlen);
-	if (opt->fixed || pat_is_fixed) {
+	if (p->fixed || pat_is_fixed) {
 #ifdef USE_LIBPCRE2
 		opt->pcre2 = 1;
 		if (pat_is_fixed) {