Merge branch 'rs/mailinfo-header-cmp' into maint

diff --git a/revision.h b/revision.h
index b8f4bc9a763e6ae7b1d8884897157e4b0bf8bd28..a6205307cf3bb2364b8642b0a4857c5b0ae9b5a9 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -75,7 +75,8 @@ struct rev_info {
        enum rev_sort_order sort_order;
 
        unsigned int    early_output:1,
-                       ignore_missing:1;
+                       ignore_missing:1,
+                       ignore_missing_links:1;
 
        /* Traversal flags */
        unsigned int    dense:1,
@@ -178,6 +179,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;