Merge branch 'np/delta' into next

diff --git a/revision.h b/revision.h
index 6eaa9048a93ec152346a335de8af604aafa0faf5..48d7b4ca94f3fd00f7a1f6a3fb57ebed934ffc0d 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -7,9 +7,11 @@
 #define SHOWN          (1u<<3)
 #define TMP_MARK       (1u<<4) /* for isolated cases; clean after use */
 #define BOUNDARY       (1u<<5)
-#define ADDED          (1u<<6) /* Parents already parsed and added? */
+#define BOUNDARY_SHOW  (1u<<6)
+#define ADDED          (1u<<7) /* Parents already parsed and added? */
 
 struct rev_info;
+struct log_info;
 
 typedef void (prune_fn_t)(struct rev_info *revs, struct commit *commit);
 
@@ -26,6 +28,7 @@ struct rev_info {
        /* Traversal flags */
        unsigned int    dense:1,
                        no_merges:1,
+                       no_walk:1,
                        remove_empty_trees:1,
                        lifo:1,
                        topo_order:1,
@@ -50,11 +53,11 @@ struct rev_info {
                        always_show_header:1;
 
        /* Format info */
-       unsigned int    abbrev_commit:1;
+       unsigned int    shown_one:1,
+                       abbrev_commit:1;
        unsigned int    abbrev;
        enum cmit_fmt   commit_format;
-       const char      *header_prefix;
-       const char      *header;
+       struct log_info *loginfo;
 
        /* special limits */
        int max_count;