Merge branch 'kb/full-history-compute-treesame-carefully-2'

diff --git a/revision.h b/revision.h
index a313a1340536321080c44d502a2bb6bc105940d5..24547b59f1d8f0d77bee6174600ea1bcb2e1b2a9 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -15,7 +15,8 @@
 #define ADDED          (1u<<7) /* Parents already parsed and added? */
 #define SYMMETRIC_LEFT (1u<<8)
 #define PATCHSAME      (1u<<9)
-#define ALL_REV_FLAGS  ((1u<<10)-1)
+#define BOTTOM         (1u<<10)
+#define ALL_REV_FLAGS  ((1u<<11)-1)
 
 #define DECORATE_SHORT_REFS    1
 #define DECORATE_FULL_REFS     2
@@ -169,6 +170,7 @@ struct rev_info {
        struct reflog_walk_info *reflog_info;
        struct decoration children;
        struct decoration merge_simplification;
+       struct decoration treesame;
 
        /* notes-specific options: which refs to show */
        struct display_notes_opt notes_opt;