aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2023-08-31 02:19:16 -0400
committerJunio C Hamano <gitster@pobox.com>2023-08-31 15:51:07 -0700
commitacd13d1eec93e714add1b3f94c8c175d6a8171cb (patch)
tree18efb475274680d5feb371efc60b0ac38d297bf2
parenttree-walk: reduce stack size for recursive functions (diff)
downloadgit-acd13d1eec93e714add1b3f94c8c175d6a8171cb.tar.gz
git-acd13d1eec93e714add1b3f94c8c175d6a8171cb.zip
tree-walk: drop MAX_TRAVERSE_TREES macro
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--tree-walk.h2
-rw-r--r--unpack-trees.h2
2 files changed, 1 insertions, 3 deletions
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;