Make it possible to not clobber object.util in sort_in_topological_order (take 2)

[git.git] / revision.h

diff --git a/revision.h b/revision.h
index 0bed3c0..31e8f61 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -4,6 +4,8 @@
 #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 */
@@ -16,6 +18,7 @@ struct rev_info {
 
        /* Traversal flags */
        unsigned int    dense:1,
+                       no_merges:1,
                        remove_empty_trees:1,
                        lifo:1,
                        topo_order:1,