Merge branch 'es/test-cmp-typocatcher'

[thirdparty/git.git] / revision.h

diff --git a/revision.h b/revision.h
index 93491b79d475adb32414008558d0d94ec9240d56..889216c2d8bd0c330e05ccb439e446b5e0543542 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -37,6 +37,10 @@
 
 /* WARNING: This is also used as REACHABLE in commit-graph.c. */
 #define PULL_MERGE     (1u<<15)
+
+#define TOPO_WALK_EXPLORED     (1u<<23)
+#define TOPO_WALK_INDEGREE     (1u<<24)
+
 /*
  * Indicates object was reached by traversal. i.e. not given by user on
  * command-line or stdin.
@@ -48,9 +52,6 @@
 #define TRACK_LINEAR   (1u<<26)
 #define ALL_REV_FLAGS  (((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR | PULL_MERGE)
 
-#define TOPO_WALK_EXPLORED     (1u<<27)
-#define TOPO_WALK_INDEGREE     (1u<<28)
-
 #define DECORATE_SHORT_REFS    1
 #define DECORATE_FULL_REFS     2
 
@@ -300,8 +301,10 @@ struct rev_info {
        struct topo_walk_info *topo_walk_info;
 
        /* Commit graph bloom filter fields */
-       /* The bloom filter key for the pathspec */
-       struct bloom_key *bloom_key;
+       /* The bloom filter key(s) for the pathspec */
+       struct bloom_key *bloom_keys;
+       int bloom_keys_nr;
+
        /*
         * The bloom filter settings used to generate the key.
         * This is loaded from the commit-graph being used.