X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=revision.h;h=91f194478bb91d381ab2b2440215144d8bb8d18d;hb=969c877506cf8cc760c7b251fef6c5b6850bfc19;hp=fa68c651424e406ce84c890a655a5e292a7e5af6;hpb=3df6499c227c28310b545edc42cdbd713ee0898a;p=git.git diff --git a/revision.h b/revision.h index fa68c6514..91f194478 100644 --- a/revision.h +++ b/revision.h @@ -2,6 +2,7 @@ #define REVISION_H #include "parse-options.h" +#include "grep.h" #define SEEN (1u<<0) #define UNINTERESTING (1u<<1) @@ -12,8 +13,7 @@ #define CHILD_SHOWN (1u<<6) #define ADDED (1u<<7) /* Parents already parsed and added? */ #define SYMMETRIC_LEFT (1u<<8) -#define TOPOSORT (1u<<9) /* In the active toposort list.. */ -#define ALL_REV_FLAGS ((1u<<10)-1) +#define ALL_REV_FLAGS ((1u<<9)-1) struct rev_info; struct log_info; @@ -93,7 +93,7 @@ struct rev_info { int show_log_size; /* Filter by commit log message */ - struct grep_opt *grep_filter; + struct grep_opt grep_filter; /* Display history graph */ struct git_graph *graph; @@ -120,7 +120,7 @@ struct rev_info { void read_revisions_from_stdin(struct rev_info *revs); typedef void (*show_early_output_fn_t)(struct rev_info *, struct commit_list *); -volatile show_early_output_fn_t show_early_output; +extern volatile show_early_output_fn_t show_early_output; extern void init_revisions(struct rev_info *revs, const char *prefix); extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);