maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge(3p/cgit): subtree merge at adcc4f82

Browse source 
Change-Id: I16941629a17a2f39b9324cb85dc0cec6b104dfe4
This commit is contained in:
Vincent Ambo 2020-11-21 19:59:36 +01:00
parent f4609b896f
commit 1e81ce6622
26 changed files with 299 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

17
third_party/cgit/ui-blob.c vendored
View file

@ -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);
}