Makefile: iconv() on Darwin has the old interface

[thirdparty/git.git] / revision.h

diff --git a/revision.h b/revision.h
index 6579a446ea8bfc7a3e8b0f19a39013458c6b537b..55e6b531ce3e5838f988ca1896484333e795f192 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -7,10 +7,9 @@
 #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)
-#define CHILD_SHOWN    (1u<<9)
 
 struct rev_info;
 struct log_info;
@@ -47,7 +46,8 @@ struct rev_info {
                        boundary:2,
                        left_right:1,
                        parents:1,
-                       reverse:1;
+                       reverse:1,
+                       first_parent_only:1;
 
        /* Diff flags */
        unsigned int    diff:1,
@@ -78,6 +78,7 @@ struct rev_info {
        const char      *add_signoff;
        const char      *extra_headers;
        const char      *log_reencode;
+       int             no_inline;
 
        /* Filter by commit log message */
        struct grep_opt *grep_filter;