From f46c4521d761a0b9909e17ef29065c0aa09c7ab7 Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Tue, 8 Jun 2021 14:27:44 -0400 Subject: Squashed 'www/git.causal.agency/cgit/' changes from 55fa25ad..5258c297 5258c297 git: update to v2.32.0 6dbbffe0 git: update to v2.31.1 62eb8db4 md2html: use proper formatting for hr d889cae8 git: update to v2.31.0 4ffadc1e git: update to v2.30.1 bd6f5683 tests: t0107: support older and/or non-GNU tar f69626c6 md2html: use sane_lists extension cef27b67 git: update to v2.30.0 b1739247 git: update to v2.29.2 fe99c76e git: update to v2.29.1 adcc4f82 tests: try with commit-graph a1039ab1 tests: do not copy snapshots to /tmp/ a4de0e81 global: replace hard coded hash length 779631c6 global: replace references to 'sha1' with 'oid' 629659d2 git: update to v2.29.0 205837d4 git: update to v2.28.0 f780396c git: update to v2.27.0 0462f08d git: update to v2.26.0 git-subtree-dir: www/git.causal.agency/cgit git-subtree-split: 5258c297ba6fb604ae1415fbc19a3fe42457e49e --- ui-tree.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'ui-tree.c') diff --git a/ui-tree.c b/ui-tree.c index 1e4efb25..b61f6f54 100644 --- a/ui-tree.c +++ b/ui-tree.c @@ -139,8 +139,7 @@ struct single_tree_ctx { }; static int single_tree_cb(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 single_tree_ctx *ctx = cbdata; @@ -185,8 +184,7 @@ static void write_tree_link(const struct object_id *oid, char *name, tree_ctx.name = NULL; tree_ctx.count = 0; - read_tree_recursive(the_repository, tree, "", 0, 1, - &paths, single_tree_cb, &tree_ctx); + read_tree(the_repository, tree, &paths, single_tree_cb, &tree_ctx); if (tree_ctx.count != 1) break; @@ -199,7 +197,7 @@ static void write_tree_link(const struct object_id *oid, char *name, } static int ls_item(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; char *name; @@ -294,14 +292,13 @@ static void ls_tree(const struct object_id *oid, const char *path, struct walk_t } ls_head(); - read_tree_recursive(the_repository, tree, "", 0, 1, - &paths, ls_item, walk_tree_ctx); + read_tree(the_repository, tree, &paths, ls_item, walk_tree_ctx); ls_tail(); } 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; @@ -326,7 +323,7 @@ static int walk_tree(const struct object_id *oid, struct strbuf *base, return 0; } } - ls_item(oid, base, pathname, mode, stage, walk_tree_ctx); + ls_item(oid, base, pathname, mode, walk_tree_ctx); return 0; } @@ -374,10 +371,8 @@ void cgit_print_tree(const char *rev, char *path) goto cleanup; } - 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 == 1) ls_tail(); else if (walk_tree_ctx.state == 2) -- cgit 1.4.1