read-tree -m A B: prime cache-tree from the switched-to tree

diff --git a/revision.h b/revision.h
index 2fdb2dd0ff3425b68b47aa8fd11155aa881d4a4a..66d211ac2e56be20fec686416dd6a2816b891239 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -43,16 +43,19 @@ struct rev_info {
                        lifo:1,
                        topo_order:1,
                        simplify_merges:1,
+                       simplify_by_decoration:1,
                        tag_objects:1,
                        tree_objects:1,
                        blob_objects:1,
                        edge_hint:1,
                        limited:1,
-                       unpacked:1, /* see also ignore_packed below */
+                       unpacked:1,
                        boundary:2,
                        left_right:1,
                        rewrite_parents:1,
                        print_parents:1,
+                       show_source:1,
+                       show_decorations:1,
                        reverse:1,
                        reverse_output_stage:1,
                        cherry_pick:1,
@@ -77,9 +80,6 @@ struct rev_info {
                        missing_newline:1;
        enum date_mode date_mode;
 
-       const char **ignore_packed; /* pretend objects in these are unpacked */
-       int num_ignore_packed;
-
        unsigned int    abbrev;
        enum cmit_fmt   commit_format;
        struct log_info *loginfo;