revert(3p/git): Revert merge of git upstream at v2.26.2
This causes cgit to serve error pages, which is undesirable. This reverts commit5229c9b232, reversing changes made tof2b211131f.
This commit is contained in:
parent
6f8fbf4aa4
commit
93ba78d6f4
1006 changed files with 60537 additions and 148724 deletions
18
third_party/git/tree.c
vendored
18
third_party/git/tree.c
vendored
|
|
@ -244,7 +244,19 @@ void free_tree_buffer(struct tree *tree)
|
|||
|
||||
struct tree *parse_tree_indirect(const struct object_id *oid)
|
||||
{
|
||||
struct repository *r = the_repository;
|
||||
struct object *obj = parse_object(r, oid);
|
||||
return (struct tree *)repo_peel_to_type(r, NULL, 0, obj, OBJ_TREE);
|
||||
struct object *obj = parse_object(the_repository, oid);
|
||||
do {
|
||||
if (!obj)
|
||||
return NULL;
|
||||
if (obj->type == OBJ_TREE)
|
||||
return (struct tree *) obj;
|
||||
else if (obj->type == OBJ_COMMIT)
|
||||
obj = &(get_commit_tree(((struct commit *)obj))->object);
|
||||
else if (obj->type == OBJ_TAG)
|
||||
obj = ((struct tag *) obj)->tagged;
|
||||
else
|
||||
return NULL;
|
||||
if (!obj->parsed)
|
||||
parse_object(the_repository, &obj->oid);
|
||||
} while (1);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue