diff options
author | June McEnroe <june@causal.agency> | 2021-06-08 14:30:12 -0400 |
---|---|---|
committer | June McEnroe <june@causal.agency> | 2021-06-08 14:34:33 -0400 |
commit | d7bd11e9b326caad68b88ae5804b7b97c9282c16 (patch) | |
tree | 14b07a9e9865abc4c57513189e31af0afb6358fa /www/git.causal.agency/cgit/ui-tree.c | |
parent | Fetch git .tar.gz for compatibility (diff) | |
parent | Squashed 'www/git.causal.agency/cgit/' changes from 55fa25ad..5258c297 (diff) | |
download | src-d7bd11e9b326caad68b88ae5804b7b97c9282c16.tar.gz src-d7bd11e9b326caad68b88ae5804b7b97c9282c16.zip |
Merge commit 'f46c4521d761a0b9909e17ef29065c0aa09c7ab7'
Diffstat (limited to 'www/git.causal.agency/cgit/ui-tree.c')
-rw-r--r-- | www/git.causal.agency/cgit/ui-tree.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/www/git.causal.agency/cgit/ui-tree.c b/www/git.causal.agency/cgit/ui-tree.c index 34e7e63a..21e0b884 100644 --- a/www/git.causal.agency/cgit/ui-tree.c +++ b/www/git.causal.agency/cgit/ui-tree.c @@ -141,8 +141,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; @@ -187,8 +186,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; @@ -201,7 +199,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; @@ -320,14 +318,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; @@ -352,7 +349,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; } @@ -400,10 +397,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) |