Git archive and trailing "/" in prefix

[git.git] / grep.h

diff --git a/grep.h b/grep.h
index 464e272edf4594539915a89d68628fd3959b8ee3..5581363c4ddb988830f9c9b776b057821107f92a 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -59,6 +59,7 @@ struct grep_opt {
        struct grep_pat *pattern_list;
        struct grep_pat **pattern_tail;
        struct grep_expr *pattern_expression;
+       const char *prefix;
        int prefix_length;
        regex_t regexp;
        int linenum;
@@ -79,11 +80,15 @@ struct grep_opt {
        int pathname;
        int null_following_name;
        int color;
+       int funcname;
        char color_match[COLOR_MAXLEN];
        const char *color_external;
        int regflags;
        unsigned pre_context;
        unsigned post_context;
+       unsigned last_shown;
+       int show_hunk_mark;
+       void *priv;
 };
 
 extern void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *origin, int no, enum grep_pat_token t);