summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-01 13:01:41 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-01 13:01:41 -0700
commit2147cb2762c67d0ec2101ab13a4c1b0ef8cab599 (patch)
tree7dccda03b60264e9922edc9bbcad3d4942d77f10 /grep.h
parente2d484c47a3445a288f4e45ee8365c912eebb26f (diff)
parentec83061156e18ce600384d3c57f90729a9295488 (diff)
downloadgit-2147cb2762c67d0ec2101ab13a4c1b0ef8cab599.tar.gz
Merge branch 'rs/maint-grep-F' into maint
"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. By René Scharfe * rs/maint-grep-F: grep: stop leaking line strings with -f grep: support newline separated pattern list grep: factor out do_append_grep_pat() grep: factor out create_grep_pat()
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 36e49d8255..ed7de6bec8 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;