diff options
author | Christian Hesse | 2021-05-18 22:49:13 +0200 |
---|---|---|
committer | Christian Hesse | 2021-06-08 12:37:46 +0200 |
commit | 5258c297ba6fb604ae1415fbc19a3fe42457e49e (patch) | |
tree | 37e7aec5ddc583047da1126ffdc41a81f20cf1f6 /ui-plain.c | |
parent | 6dbbffe01533a91c79c4497c80f46af8e1581e25 (diff) | |
download | cgit-5258c297ba6fb604ae1415fbc19a3fe42457e49e.tar.gz cgit-5258c297ba6fb604ae1415fbc19a3fe42457e49e.tar.bz2 cgit-5258c297ba6fb604ae1415fbc19a3fe42457e49e.zip |
git: update to v2.32.0
Update to git version v2.32.0, this requires changes for these
upstream commits:
* 47957485b3b731a7860e0554d2bd12c0dce1c75a
tree.h API: simplify read_tree_recursive() signature
Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'ui-plain.c')
-rw-r--r-- | ui-plain.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -130,7 +130,7 @@ static void print_dir_tail(void) | |||
130 | } | 130 | } |
131 | 131 | ||
132 | static int walk_tree(const struct object_id *oid, struct strbuf *base, | 132 | static int walk_tree(const struct object_id *oid, struct strbuf *base, |
133 | const char *pathname, unsigned mode, int stage, void *cbdata) | 133 | const char *pathname, unsigned mode, void *cbdata) |
134 | { | 134 | { |
135 | struct walk_tree_context *walk_tree_ctx = cbdata; | 135 | struct walk_tree_context *walk_tree_ctx = cbdata; |
136 | 136 | ||
@@ -198,9 +198,8 @@ void cgit_print_plain(void) | |||
198 | } | 198 | } |
199 | else | 199 | else |
200 | walk_tree_ctx.match_baselen = basedir_len(path_items.match); | 200 | walk_tree_ctx.match_baselen = basedir_len(path_items.match); |
201 | read_tree_recursive(the_repository, | 201 | read_tree(the_repository, repo_get_commit_tree(the_repository, commit), |
202 | repo_get_commit_tree(the_repository, commit), | 202 | &paths, walk_tree, &walk_tree_ctx); |
203 | "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | ||
204 | if (!walk_tree_ctx.match) | 203 | if (!walk_tree_ctx.match) |
205 | cgit_print_error_page(404, "Not found", "Not found"); | 204 | cgit_print_error_page(404, "Not found", "Not found"); |
206 | else if (walk_tree_ctx.match == 2) | 205 | else if (walk_tree_ctx.match == 2) |