diff options
| author | Christian Hesse <mail@eworm.de> | 2021-05-18T20·49+0200 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·14+0300 |
| commit | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (patch) | |
| tree | 540e2c47f287ab9e07630e94c45eaddaa067a5a0 /third_party/cgit/ui-blob.c | |
| parent | b0926aa53d04c4e9b01aee38927dc20f4bf4d78f (diff) | |
chore(3p/cgit): git: update to v2.32.0 r/2902
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> Change-Id: I9c37205af2e67d03f9cdd3d39e4fbd611bfa7288
Diffstat (limited to 'third_party/cgit/ui-blob.c')
| -rw-r--r-- | third_party/cgit/ui-blob.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/third_party/cgit/ui-blob.c b/third_party/cgit/ui-blob.c index f76c641e355b..c10ae42ebd05 100644 --- a/third_party/cgit/ui-blob.c +++ b/third_party/cgit/ui-blob.c @@ -19,7 +19,7 @@ struct walk_tree_context { }; 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; @@ -56,9 +56,9 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only) goto done; if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT) goto done; - read_tree_recursive(the_repository, - repo_get_commit_tree(the_repository, lookup_commit_reference(the_repository, &oid)), - "", 0, 0, &paths, walk_tree, &walk_tree_ctx); + read_tree(the_repository, + repo_get_commit_tree(the_repository, lookup_commit_reference(the_repository, &oid)), + &paths, walk_tree, &walk_tree_ctx); done: free(path_items.match); @@ -92,10 +92,8 @@ int cgit_print_file(char *path, const char *head, int file_only) type = oid_object_info(the_repository, &oid, &size); if (type == OBJ_COMMIT) { commit = lookup_commit_reference(the_repository, &oid); - 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.found_path) return -1; type = oid_object_info(the_repository, &oid, &size); @@ -151,10 +149,8 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl if ((!hex) && type == OBJ_COMMIT && path) { commit = lookup_commit_reference(the_repository, &oid); - 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); type = oid_object_info(the_repository, &oid, &size); } |