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-blob.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-blob.c')
-rw-r--r-- | ui-blob.c | 20 |
1 files changed, 8 insertions, 12 deletions
@@ -19,7 +19,7 @@ struct walk_tree_context { | |||
19 | }; | 19 | }; |
20 | 20 | ||
21 | static int walk_tree(const struct object_id *oid, struct strbuf *base, | 21 | static int walk_tree(const struct object_id *oid, struct strbuf *base, |
22 | const char *pathname, unsigned mode, int stage, void *cbdata) | 22 | const char *pathname, unsigned mode, void *cbdata) |
23 | { | 23 | { |
24 | struct walk_tree_context *walk_tree_ctx = cbdata; | 24 | struct walk_tree_context *walk_tree_ctx = cbdata; |
25 | 25 | ||
@@ -56,9 +56,9 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only) | |||
56 | goto done; | 56 | goto done; |
57 | if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT) | 57 | if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT) |
58 | goto done; | 58 | goto done; |
59 | read_tree_recursive(the_repository, | 59 | read_tree(the_repository, |
60 | repo_get_commit_tree(the_repository, lookup_commit_reference(the_repository, &oid)), | 60 | repo_get_commit_tree(the_repository, lookup_commit_reference(the_repository, &oid)), |
61 | "", 0, 0, &paths, walk_tree, &walk_tree_ctx); | 61 | &paths, walk_tree, &walk_tree_ctx); |
62 | 62 | ||
63 | done: | 63 | done: |
64 | free(path_items.match); | 64 | free(path_items.match); |
@@ -92,10 +92,8 @@ int cgit_print_file(char *path, const char *head, int file_only) | |||
92 | type = oid_object_info(the_repository, &oid, &size); | 92 | type = oid_object_info(the_repository, &oid, &size); |
93 | if (type == OBJ_COMMIT) { | 93 | if (type == OBJ_COMMIT) { |
94 | commit = lookup_commit_reference(the_repository, &oid); | 94 | commit = lookup_commit_reference(the_repository, &oid); |
95 | read_tree_recursive(the_repository, | 95 | read_tree(the_repository, repo_get_commit_tree(the_repository, commit), |
96 | repo_get_commit_tree(the_repository, commit), | 96 | &paths, walk_tree, &walk_tree_ctx); |
97 | "", 0, 0, &paths, walk_tree, | ||
98 | &walk_tree_ctx); | ||
99 | if (!walk_tree_ctx.found_path) | 97 | if (!walk_tree_ctx.found_path) |
100 | return -1; | 98 | return -1; |
101 | type = oid_object_info(the_repository, &oid, &size); | 99 | 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 | |||
151 | 149 | ||
152 | if ((!hex) && type == OBJ_COMMIT && path) { | 150 | if ((!hex) && type == OBJ_COMMIT && path) { |
153 | commit = lookup_commit_reference(the_repository, &oid); | 151 | commit = lookup_commit_reference(the_repository, &oid); |
154 | read_tree_recursive(the_repository, | 152 | read_tree(the_repository, repo_get_commit_tree(the_repository, commit), |
155 | repo_get_commit_tree(the_repository, commit), | 153 | &paths, walk_tree, &walk_tree_ctx); |
156 | "", 0, 0, &paths, walk_tree, | ||
157 | &walk_tree_ctx); | ||
158 | type = oid_object_info(the_repository, &oid, &size); | 154 | type = oid_object_info(the_repository, &oid, &size); |
159 | } | 155 | } |
160 | 156 | ||