aboutsummaryrefslogtreecommitdiffstats
path: root/ui-blame.c
diff options
context:
space:
mode:
authorBryan Brattlof <hello@bryanbrattlof.com>2021-06-23 14:29:25 -0400
committerBryan Brattlof <hello@bryanbrattlof.com>2021-06-23 14:29:25 -0400
commit42731d9a75187db022bdd8db4af8b1bb05e939ec (patch)
tree83bdae359d0cab387be86f68cd94af6b863ada4f /ui-blame.c
parent71f7280aac159ba51f9af379227c1d9595cabf29 (diff)
parent5258c297ba6fb604ae1415fbc19a3fe42457e49e (diff)
downloadcgit-canon.tar.gz
cgit-canon.tar.bz2
Merge remote-tracking branch 'zx2c4/master' into canonHEAD22.23.6canon
* Update to git version v2.32.0 * md2html: use proper formatting for hr
Diffstat (limited to 'ui-blame.c')
-rw-r--r--ui-blame.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/ui-blame.c b/ui-blame.c
index ec1d888..03136f7 100644
--- a/ui-blame.c
+++ b/ui-blame.c
@@ -221,8 +221,7 @@ cleanup:
}
static int walk_tree(const struct object_id *oid, struct strbuf *base,
- const char *pathname, unsigned mode, int stage,
- void *cbdata)
+ const char *pathname, unsigned mode, void *cbdata)
{
struct walk_tree_context *walk_tree_ctx = cbdata;
@@ -291,10 +290,8 @@ void cgit_print_blame(void)
walk_tree_ctx.match_baselen = (path_items.match) ?
basedir_len(path_items.match) : -1;
- read_tree_recursive(the_repository,
- repo_get_commit_tree(the_repository, commit),
- "", 0, 0,
- &paths, walk_tree, &walk_tree_ctx);
+ read_tree(the_repository, repo_get_commit_tree(the_repository, commit),
+ &paths, walk_tree, &walk_tree_ctx);
if (!walk_tree_ctx.state)
cgit_print_error_page(404, "Not found", "Not found");
else if (walk_tree_ctx.state == 2)