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()
This commit is contained in:
Junio C Hamano
2012-06-01 13:01:41 -07:00
5 changed files with 68 additions and 24 deletions

2
grep.h
View File

@ -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;