Merge branch 'jn/run-command-error-failure'

diff --git a/revision.h b/revision.h
index ae948601f94c726c3677f23517dba5c046431904..bca9947977c50d151b0fed90931ec52112e72bae 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -41,8 +41,6 @@ struct rev_info {
        /* Traversal flags */
        unsigned int    dense:1,
                        prune:1,
-                       no_merges:1,
-                       merges_only:1,
                        no_walk:1,
                        show_all:1,
                        remove_empty_trees:1,
@@ -126,6 +124,8 @@ struct rev_info {
        int max_count;
        unsigned long max_age;
        unsigned long min_age;
+       int min_parents;
+       int max_parents;
 
        /* diff info for patches and for paths limiting */
        struct diff_options diffopt;
@@ -141,6 +141,7 @@ struct rev_info {
        /* commit counts */
        int count_left;
        int count_right;
+       int count_same;
 };
 
 #define REV_TREE_SAME          0