summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-18 14:37:53 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-18 14:37:54 -0700
commit3d7535e42496a5b24d8cb17da1a332759928bd35 (patch)
tree9139e1d1e3fb7d3cbe75c0aefe7cd07f6fd28034 /grep.h
parent06e211acc61c52a2e1709ea8b62a0b0f6dcb492b (diff)
parent39f2e017203695b9da2ad35589b0e58bcac6fdc8 (diff)
downloadgit-3d7535e42496a5b24d8cb17da1a332759928bd35.tar.gz
Merge branch 'jc/maint-log-grep-all-match'
Fix a long-standing bug in "git log --grep" when multiple "--grep" are used together with "--all-match" and "--author" or "--committer". * jc/maint-log-grep-all-match: t7810-grep: test --all-match with multiple --grep and --author options t7810-grep: test interaction of multiple --grep and --author options t7810-grep: test multiple --author with --all-match t7810-grep: test multiple --grep with and without --all-match t7810-grep: bring log --grep tests in common form grep.c: mark private file-scope symbols as static log: document use of multiple commit limiting options log --grep/--author: honor --all-match honored for multiple --grep patterns grep: show --debug output only once grep: teach --debug option to dump the parse tree
Diffstat (limited to 'grep.h')
-rw-r--r--grep.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/grep.h b/grep.h
index 75afb7b105..8a28a676fc 100644
--- a/grep.h
+++ b/grep.h
@@ -98,6 +98,7 @@ struct grep_opt {
int word_regexp;
int fixed;
int all_match;
+ int debug;
#define GREP_BINARY_DEFAULT 0
#define GREP_BINARY_NOMATCH 1
#define GREP_BINARY_TEXT 2
@@ -158,11 +159,10 @@ struct grep_source {
void grep_source_init(struct grep_source *gs, enum grep_source_type type,
const char *name, const void *identifier);
-int grep_source_load(struct grep_source *gs);
void grep_source_clear_data(struct grep_source *gs);
void grep_source_clear(struct grep_source *gs);
void grep_source_load_driver(struct grep_source *gs);
-int grep_source_is_binary(struct grep_source *gs);
+
int grep_source(struct grep_opt *opt, struct grep_source *gs);