From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sat, 25 Jun 2016 05:22:27 +0000 (+0200)
Subject: grep: break down an "if" stmt in preparation for next changes
X-Git-Tag: v2.9.3~47^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60452a30f5971c54ecdcd1bd389c1cabbbc844f5;p=thirdparty%2Fgit.git

grep: break down an "if" stmt in preparation for next changes

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/grep.c b/grep.c
index 7b2b96a437..f430d7e756 100644
--- a/grep.c
+++ b/grep.c
@@ -403,7 +403,9 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
 	p->word_regexp = opt->word_regexp;
 	p->ignore_case = opt->ignore_case;
 
-	if (opt->fixed || is_fixed(p->pattern, p->patternlen))
+	if (opt->fixed)
+		p->fixed = 1;
+	else if (is_fixed(p->pattern, p->patternlen))
 		p->fixed = 1;
 	else
 		p->fixed = 0;