Merge branch 'jk/diff-filespec-cleanup'

diff --git a/revision.h b/revision.h
index 89132df2fa481ce6cdd142fa31f5b2cfd2f43219..1eb94c1548c019a4d41cb42af805918afbc237bf 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -61,6 +61,9 @@ struct rev_info {
        /* The end-points specified by the end user */
        struct rev_cmdline_info cmdline;
 
+       /* excluding from --branches, --refs, etc. expansion */
+       struct string_list *ref_excludes;
+
        /* Basic information */
        const char *prefix;
        const char *def;
@@ -169,6 +172,8 @@ struct rev_info {
        unsigned long min_age;
        int min_parents;
        int max_parents;
+       int (*include_check)(struct commit *, void *);
+       void *include_check_data;
 
        /* diff info for patches and for paths limiting */
        struct diff_options diffopt;
@@ -194,6 +199,11 @@ struct rev_info {
        struct saved_parents *saved_parents_slab;
 };
 
+extern int ref_excluded(struct string_list *, const char *path);
+void clear_ref_exclusion(struct string_list **);
+void add_ref_exclusion(struct string_list **, const char *exclude);
+
+
 #define REV_TREE_SAME          0
 #define REV_TREE_NEW           1       /* Only new files */
 #define REV_TREE_OLD           2       /* Only files removed */