summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-25 19:04:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-25 19:04:19 (GMT)
commitfca9e0013eeaad45bff38f66667d2791a1edc53f (patch)
treeb487bf942d747ec16185d361b9249eb5034b7ca4 /grep.h
parent4f64464023d0bf7ce065f1dccaf267ca38b3521f (diff)
parentec83061156e18ce600384d3c57f90729a9295488 (diff)
downloadgit-fca9e0013eeaad45bff38f66667d2791a1edc53f.zip
git-fca9e0013eeaad45bff38f66667d2791a1edc53f.tar.gz
git-fca9e0013eeaad45bff38f66667d2791a1edc53f.tar.bz2
Merge branch 'rs/maint-grep-F'
"git grep -e '$pattern'", unlike the case where the patterns are read from a file, did not treat individual lines in the given pattern argument as separate regular expressions as it should.
Diffstat (limited to 'grep.h')
-rw-r--r--grep.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/grep.h b/grep.h
index 36e49d8..ed7de6b 100644
--- a/grep.h
+++ b/grep.h
@@ -38,7 +38,7 @@ struct grep_pat {
const char *origin;
int no;
enum grep_pat_token token;
- const char *pattern;
+ char *pattern;
size_t patternlen;
enum grep_header_field field;
regex_t regexp;