summaryrefslogtreecommitdiff
path: root/grep.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2010-02-03 18:16:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-03 20:03:40 (GMT)
commit79286102ce1620c5b0e73dc4559450eb24918e08 (patch)
tree5f3473de19fda87e859f20caf64e79f5792890a8 /grep.c
parent4b7acc186f33037178f4d137b2e6099c67492bde (diff)
downloadgit-79286102ce1620c5b0e73dc4559450eb24918e08.zip
git-79286102ce1620c5b0e73dc4559450eb24918e08.tar.gz
git-79286102ce1620c5b0e73dc4559450eb24918e08.tar.bz2
grep: simplify assignment of ->fixed
After 885d211e, the value of the ->fixed pattern option only depends on the grep option of the same name. Regex flags don't matter any more, because fixed mode and regex mode are strictly separated. Thus we can simply copy the value from struct grep_opt to struct grep_pat, as we do already for ->word_regexp and ->ignore_case. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'grep.c')
-rw-r--r--grep.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/grep.c b/grep.c
index 60cce46..a0864f1 100644
--- a/grep.c
+++ b/grep.c
@@ -57,11 +57,8 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
p->word_regexp = opt->word_regexp;
p->ignore_case = opt->ignore_case;
+ p->fixed = opt->fixed;
- if (opt->fixed)
- p->fixed = 1;
- if (opt->regflags & REG_ICASE)
- p->fixed = 0;
if (p->fixed)
return;