Merge branch 'maint'

[git.git] / grep.h

diff --git a/grep.h b/grep.h
index d252dd25f81526d9b8663b4d3c9585d69a901397..45a222d904b5898758c3c84f6ef1e0119c81f6b2 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -17,12 +17,18 @@ enum grep_context {
        GREP_CONTEXT_BODY,
 };
 
+enum grep_header_field {
+       GREP_HEADER_AUTHOR = 0,
+       GREP_HEADER_COMMITTER,
+};
+
 struct grep_pat {
        struct grep_pat *next;
        const char *origin;
        int no;
        enum grep_pat_token token;
        const char *pattern;
+       enum grep_header_field field;
        regex_t regexp;
 };
 
@@ -68,12 +74,14 @@ struct grep_opt {
        unsigned extended:1;
        unsigned relative:1;
        unsigned pathname:1;
+       unsigned null_following_name:1;
        int regflags;
        unsigned pre_context;
        unsigned post_context;
 };
 
 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 *);
 extern void compile_grep_patterns(struct grep_opt *opt);
 extern void free_grep_patterns(struct grep_opt *opt);
 extern int grep_buffer(struct grep_opt *opt, const char *name, char *buf, unsigned long size);