diff options
author | Junio C Hamano <junkio@cox.net> | 2006-09-28 03:42:53 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-09-28 03:42:53 +0400 |
commit | a3f5d02edb2c1a037ed3ed8d2ebd3f3e5da9d198 (patch) | |
tree | 00e134633cc8d37e0631bfe5ffe8f863bc0feffc | |
parent | b48fb5b6a950a6757b790e9160967065a3e03978 (diff) |
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>
-rw-r--r-- | grep.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -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; |