diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·58+0100 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·58+0100 |
| commit | 5d4756e75ce12a6b67af3a16193f10047ba05218 (patch) | |
| tree | d631c73d8c7a9d2856e4be6ac25faf1cbed588cd /ui-blob.c | |
| parent | 723dc8fbcb1a4609c264758eae420ee2811a2b55 (diff) | |
Squashed 'third_party/cgit/' changes from 8fc0c81bbb..adcc4f822f
adcc4f822f tests: try with commit-graph a1039ab175 tests: do not copy snapshots to /tmp/ a4de0e810b global: replace hard coded hash length 779631c6dc global: replace references to 'sha1' with 'oid' 629659d2cf git: update to v2.29.0 205837d468 git: update to v2.28.0 f780396c0a git: update to v2.27.0 0462f08d85 git: update to v2.26.0 55fa25adb0 Bump version 6a8d6d4b50 global: use proper accessors for maybe_tree 892ba8c3cc ui-snapshot: add support for zstd compression cc230bf044 tests: add tests for xz compressed snapshots 06671f4b21 ui-snapshot: add support for lzip compression fde897b817 git: update to v2.25.1 5e49023b01 tests: allow to skip git version tests fa146ccabd Bump version bd68c98879 git: update to v2.25.0 ca98c9e7bf tests: skip tests if strace is not functional d8e5dd25a0 git: update to v2.24.1 583aa5d80e ui-repolist: do not return unsigned (negative) value bfabd4519c git: update to v2.24.0 git-subtree-dir: third_party/cgit git-subtree-split: adcc4f822fe11836e5f942fc1ae0f00db4eb8d5f
Diffstat (limited to 'ui-blob.c')
| -rw-r--r-- | ui-blob.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/ui-blob.c b/ui-blob.c index 30e2d4bf5f..f76c641e35 100644 --- a/ui-blob.c +++ b/ui-blob.c @@ -56,8 +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, lookup_commit_reference(the_repository, &oid)->maybe_tree, - "", 0, 0, &paths, walk_tree, &walk_tree_ctx); + 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); done: free(path_items.match); @@ -91,8 +92,10 @@ 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, commit->maybe_tree, - "", 0, 0, &paths, walk_tree, &walk_tree_ctx); + read_tree_recursive(the_repository, + repo_get_commit_tree(the_repository, commit), + "", 0, 0, &paths, walk_tree, + &walk_tree_ctx); if (!walk_tree_ctx.found_path) return -1; type = oid_object_info(the_repository, &oid, &size); @@ -148,8 +151,10 @@ 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, commit->maybe_tree, - "", 0, 0, &paths, walk_tree, &walk_tree_ctx); + read_tree_recursive(the_repository, + repo_get_commit_tree(the_repository, commit), + "", 0, 0, &paths, walk_tree, + &walk_tree_ctx); type = oid_object_info(the_repository, &oid, &size); } |