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-blame.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-blame.c')
-rw-r--r-- | ui-blame.c | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -221,8 +221,7 @@ cleanup: | |||
221 | } | 221 | } |
222 | 222 | ||
223 | static int walk_tree(const struct object_id *oid, struct strbuf *base, | 223 | static int walk_tree(const struct object_id *oid, struct strbuf *base, |
224 | const char *pathname, unsigned mode, int stage, | 224 | const char *pathname, unsigned mode, void *cbdata) |
225 | void *cbdata) | ||
226 | { | 225 | { |
227 | struct walk_tree_context *walk_tree_ctx = cbdata; | 226 | struct walk_tree_context *walk_tree_ctx = cbdata; |
228 | 227 | ||
@@ -291,10 +290,8 @@ void cgit_print_blame(void) | |||
291 | walk_tree_ctx.match_baselen = (path_items.match) ? | 290 | walk_tree_ctx.match_baselen = (path_items.match) ? |
292 | basedir_len(path_items.match) : -1; | 291 | basedir_len(path_items.match) : -1; |
293 | 292 | ||
294 | read_tree_recursive(the_repository, | 293 | read_tree(the_repository, repo_get_commit_tree(the_repository, commit), |
295 | repo_get_commit_tree(the_repository, commit), | 294 | &paths, walk_tree, &walk_tree_ctx); |
296 | "", 0, 0, | ||
297 | &paths, walk_tree, &walk_tree_ctx); | ||
298 | if (!walk_tree_ctx.state) | 295 | if (!walk_tree_ctx.state) |
299 | cgit_print_error_page(404, "Not found", "Not found"); | 296 | cgit_print_error_page(404, "Not found", "Not found"); |
300 | else if (walk_tree_ctx.state == 2) | 297 | else if (walk_tree_ctx.state == 2) |