X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=revision.h;h=55e6b531ce3e5838f988ca1896484333e795f192;hb=5cb71f82de7fc370dfcd7aad505c36d89e8fec5d;hp=8f7907d7abdb764317612d868f58ab88f7175b59;hpb=eff73751bb94b0241fd2204effb8680fe9973cbf;p=git.git

diff --git a/revision.h b/revision.h
index 8f7907d7a..55e6b531c 100644
--- 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,9 +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;
+			parents:1,
+			reverse:1,
+			first_parent_only:1;
 
 	/* Diff flags */
 	unsigned int	diff:1,
@@ -73,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;
@@ -89,6 +95,8 @@ struct rev_info {
 
 	topo_sort_set_fn_t topo_setter;
 	topo_sort_get_fn_t topo_getter;
+
+	struct reflog_walk_info *reflog_info;
 };
 
 #define REV_TREE_SAME		0