diff options
author | Jeff King <peff@peff.net> | 2012-10-29 04:12:15 -0400 |
---|---|---|
committer | Jeff King <peff@peff.net> | 2012-10-29 04:12:15 -0400 |
commit | d2f4469b13dcd5c850058fdee4b039f07bb33142 (patch) | |
tree | 8429b77b5076d354bac240ed165d4b27c7f79ff6 /grep.h | |
parent | fdb4d27158e4f8e19ac3b11b896bff92038afbfa (diff) | |
parent | 0657bcbf6f0830bc4ce25d05060706f35f1d4eb7 (diff) | |
download | git-d2f4469b13dcd5c850058fdee4b039f07bb33142.tar.gz |
Merge branch 'jc/grep-pcre-loose-ends'
"git log -F -E --grep='<ere>'" failed to use the given <ere>
pattern as extended regular expression, and instead looked for the
string literally. The early part of this series is a fix for it;
the latter part teaches log to respect the grep.* configuration.
* jc/grep-pcre-loose-ends:
log: honor grep.* configuration
log --grep: accept --basic-regexp and --perl-regexp
log --grep: use the same helper to set -E/-F options as "git grep"
revisions: initialize revs->grep_filter using grep_init()
grep: move pattern-type bits support to top-level grep.[ch]
grep: move the configuration parsing logic to grep.[ch]
builtin/grep.c: make configuration callback more reusable
Diffstat (limited to 'grep.h')
-rw-r--r-- | grep.h | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -138,6 +138,12 @@ struct grep_opt { void *output_priv; }; +extern void init_grep_defaults(void); +extern int grep_config(const char *var, const char *value, void *); +extern void grep_init(struct grep_opt *, const char *prefix); +void grep_set_pattern_type_option(enum grep_pattern_type, struct grep_opt *opt); +void grep_commit_pattern_type(enum grep_pattern_type, struct grep_opt *opt); + extern void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t); extern void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *origin, int no, enum grep_pat_token t); extern void append_header_grep_pattern(struct grep_opt *, enum grep_header_field, const char *); |