grep: fix --fixed-strings combined with expression.

"git grep --fixed-strings -e GIT --and -e VERSION .gitignore"
misbehaved because we did not notice this needs to grab lines
that have the given two fixed strings at the same time.

Signed-off-by: Junio C Hamano <junkio@cox.net>

1 files changed, 2 insertions, 5 deletions

diff --git a/grep.c b/grep.c
index 2c740bde5..c411ddd4d 100644
--- a/grep.c
+++ b/grep.c
@@ -138,16 +138,13 @@ void compile_grep_patterns(struct grep_opt *opt)
 {
 	struct grep_pat *p;
 
-	if (opt->fixed)
-		return;
-
-	/* First compile regexps */
 	for (p = opt->pattern_list; p; p = p->next) {
 		switch (p->token) {
 		case GREP_PATTERN: /* atom */
 		case GREP_PATTERN_HEAD:
 		case GREP_PATTERN_BODY:
-			compile_regexp(p, opt);
+			if (!opt->fixed)
+				compile_regexp(p, opt);
 			break;
 		default:
 			opt->extended = 1;