mergetool: portability fix: don't assume true is in /bin

diff --git a/revision.h b/revision.h
index cf337136086073d9d1356d615ac104d83c53b11a..55e6b531ce3e5838f988ca1896484333e795f192 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -7,7 +7,7 @@
 #define SHOWN          (1u<<3)
 #define TMP_MARK       (1u<<4) /* for isolated cases; clean after use */
 #define BOUNDARY       (1u<<5)
-#define BOUNDARY_SHOW  (1u<<6)
+#define CHILD_SHOWN    (1u<<6)
 #define ADDED          (1u<<7) /* Parents already parsed and added? */
 #define SYMMETRIC_LEFT (1u<<8)
 
@@ -21,6 +21,9 @@ struct rev_info {
        struct commit_list *commits;
        struct object_array pending;
 
+       /* Parents of shown commits */
+       struct object_array boundary_commits;
+
        /* Basic information */
        const char *prefix;
        void *prune_data;
@@ -40,10 +43,11 @@ struct rev_info {
                        edge_hint:1,
                        limited:1,
                        unpacked:1, /* see also ignore_packed below */
-                       boundary:1,
+                       boundary:2,
                        left_right:1,
                        parents:1,
-                       reverse:2;
+                       reverse:1,
+                       first_parent_only:1;
 
        /* Diff flags */
        unsigned int    diff:1,