Merge branch 'jc/log-quiet-fix'

diff --git a/revision.h b/revision.h
index 9fd8f3016fe8f935f176f57c615f72df8ba8d157..4499cebded6bc4348c0648a77d6e0dae4cf00acf 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -36,7 +36,8 @@ 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,
@@ -90,6 +91,7 @@ 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;
@@ -141,6 +143,7 @@ struct rev_info {
        /* commit counts */
        int count_left;
        int count_right;
+       int count_same;
 };
 
 #define REV_TREE_SAME          0