| Message ID | 20230831061916.GB3185325@coredump.intra.peff.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | acd13d1eec93e714add1b3f94c8c175d6a8171cb |
| Headers | show |
| Series | tree name and depth limits | expand |
diff --git a/tree-walk.h b/tree-walk.h index 74cdceb3fe..a6bfa3da3a 100644 --- a/tree-walk.h +++ b/tree-walk.h @@ -6,8 +6,6 @@ struct index_state; struct repository; -#define MAX_TRAVERSE_TREES 8 - /** * The tree walking API is used to traverse and inspect trees. */ diff --git a/unpack-trees.h b/unpack-trees.h index 9b827c307f..5867e26e17 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -7,7 +7,7 @@ #include "string-list.h" #include "tree-walk.h" -#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES +#define MAX_UNPACK_TREES 8 struct cache_entry; struct unpack_trees_options;
Since the previous commit dropped the hard-coded limit in traverse_trees(), we don't need this macro there anymore (the code can handle any number of trees in parallel). We do define MAX_UNPACK_TREES using MAX_TRAVERSE_TREES, due to 5290d45134 (tree-walk.c: break circular dependency with unpack-trees, 2020-02-01). So we can just directly define that as "8" now; we know traverse_trees() can handle whatever we throw at it. Signed-off-by: Jeff King <peff@peff.net> --- I think from previous discussions that this "8" may also be excessive. But digging into that should definitely be left for another series. tree-walk.h | 2 -- unpack-trees.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)