diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-29 22:30:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-29 22:30:56 -0700 |
| commit | 31d69db340d3d056668cbc278abf01a0a552d9b4 (patch) | |
| tree | 932086eb0528a96e17d908e5528e33758462f9e3 /grep.h | |
| parent | 52938b113b4dd09bae869326d4993a7b998e6877 (diff) | |
| parent | 3083301ead459a45059af3ee85fb51d5d737a74d (diff) | |
| download | git-31d69db340d3d056668cbc278abf01a0a552d9b4.tar.gz | |
Merge branch 'jc/maint-log-grep-all-match-1' into maint
* jc/maint-log-grep-all-match-1:
grep.c: make two symbols really file-scope static this time
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.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -90,6 +90,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 @@ -148,11 +149,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); |