revision: add leak_pending flag

diff --git a/revision.h b/revision.h
index ae948601f94c726c3677f23517dba5c046431904..366a9b49b0f43ee69fc43267a8f58fba19c7ae36 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -36,13 +36,12 @@ struct rev_info {
        const char *prefix;
        const char *def;
        struct pathspec prune_data;
-       unsigned int early_output;
+       unsigned int    early_output:1,
+                       ignore_missing:1;
 
        /* Traversal flags */
        unsigned int    dense:1,
                        prune:1,
-                       no_merges:1,
-                       merges_only:1,
                        no_walk:1,
                        show_all:1,
                        remove_empty_trees:1,
@@ -92,10 +91,13 @@ struct rev_info {
                        show_notes_given:1,
                        pretty_given:1,
                        abbrev_commit:1,
+                       abbrev_commit_given:1,
                        use_terminator:1,
                        missing_newline:1,
-                       date_mode_explicit:1;
+                       date_mode_explicit:1,
+                       preserve_subject:1;
        unsigned int    disable_stdin:1;
+       unsigned int    leak_pending:1;
 
        enum date_mode date_mode;
 
@@ -126,6 +128,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 +145,7 @@ struct rev_info {
        /* commit counts */
        int count_left;
        int count_right;
+       int count_same;
 };
 
 #define REV_TREE_SAME          0
@@ -187,6 +192,7 @@ extern void add_object(struct object *obj,
                       const char *name);
 
 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
+extern void add_pending_sha1(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags);
 
 extern void add_head_to_pending(struct rev_info *);