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

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

View file

@ -390,12 +390,14 @@ void cgit_print_tree(const char *rev, char *path)
walk_tree_ctx.curr_rev = xstrdup(rev);
if (path == NULL) {
ls_tree(&commit->maybe_tree->object.oid, NULL, &walk_tree_ctx);
ls_tree(get_commit_tree_oid(commit), NULL, &walk_tree_ctx);
goto cleanup;
}
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.state == 1)
ls_tail();
else if (walk_tree_ctx.state == 2)