Test 'checkout -m -- path'

diff --git a/revision.h b/revision.h
index 1c0abf0f58e3559588cd6522210bc9cf76d43f0f..9fd8f3016fe8f935f176f57c615f72df8ba8d157 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -35,14 +35,12 @@ struct rev_info {
        /* Basic information */
        const char *prefix;
        const char *def;
-       void *prune_data;
+       struct pathspec prune_data;
        unsigned int early_output;
 
        /* 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;