Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remember to attach the parent tree when converting TreeEntry() -> Tree() #22902

Merged
merged 3 commits into from
Feb 14, 2023
Merged

Remember to attach the parent tree when converting TreeEntry() -> Tree() #22902

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df33253
Attach the parent tree when creating Tree()
kousu Feb 14, 2023
711411e
Merge branch 'main' into treeentry-ptree
kousu Feb 14, 2023
c381eb8
Merge branch 'main' into treeentry-ptree
kousu Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/git/tree_entry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,13 @@ func (te *TreeEntry) FollowLinks() (*TreeEntry, error) {
return entry, nil
}

// returns the subtree, or nil if this is not a tree
// returns the Tree pointed to by this TreeEntry, or nil if this is not a tree
func (te *TreeEntry) Tree() *Tree {
t, err := te.ptree.repo.getTree(te.ID)
if err != nil {
return nil
}
t.ptree = te.ptree
return t
}

Expand Down