X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=revision.h;h=31e8f615677634a92992df8404c86a8c2184ff2a;hb=6c2711e70cc070559537a44f4975add451ee53f2;hp=a22f198515f9cce097bad41cb64139eff7459540;hpb=213523f46c51c5e5f1b2623dcb3af822add75caa;p=git.git

diff --git a/revision.h b/revision.h
index a22f1985..31e8f615 100644
--- a/revision.h
+++ b/revision.h
@@ -3,6 +3,9 @@
 
 #define SEEN		(1u<<0)
 #define UNINTERESTING   (1u<<1)
+#define TREECHANGE	(1u<<2)
+#define SHOWN		(1u<<3)
+#define TMP_MARK	(1u<<4) /* for isolated cases; clean after use */
 
 struct rev_info {
 	/* Starting list */
@@ -15,6 +18,7 @@ struct rev_info {
 
 	/* Traversal flags */
 	unsigned int	dense:1,
+			no_merges:1,
 			remove_empty_trees:1,
 			lifo:1,
 			topo_order:1,
@@ -32,7 +36,10 @@ struct rev_info {
 };
 
 /* revision.c */
-extern int setup_revisions(int argc, const char **argv, struct rev_info *revs);
+extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
+extern void prepare_revision_walk(struct rev_info *revs);
+extern struct commit *get_revision(struct rev_info *revs);
+
 extern void mark_parents_uninteresting(struct commit *commit);
 extern void mark_tree_uninteresting(struct tree *tree);