diff options
| author | Florian Pritz <bluewind@xinu.at> | 2020-03-14 08:55:46 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2020-03-14 08:55:46 +0100 |
| commit | 2cbdd90e0f8575eda6486b4bb06521d848eaa307 (patch) | |
| tree | fc28a97fede3b74ae2cb2e778ffd4c0ae59c637b /ui-blob.c | |
| parent | 6c66430e9658616e118d10af9c9ab48858a04e67 (diff) | |
| parent | 55fa25adb097d2681607d8b0f51a0c393cc9af1a (diff) | |
| download | cgit-2cbdd90e0f8575eda6486b4bb06521d848eaa307.tar.gz cgit-2cbdd90e0f8575eda6486b4bb06521d848eaa307.tar.xz | |
Merge branch 'master' of https://git.zx2c4.com/cgit into local
Diffstat (limited to 'ui-blob.c')
| -rw-r--r-- | ui-blob.c | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -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); } |