diff options
Diffstat (limited to 'object/resolve/peel_to_tree.go')
| -rw-r--r-- | object/resolve/peel_to_tree.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/object/resolve/peel_to_tree.go b/object/resolve/peel_to_tree.go index 3b12bdd8..2f2da4d7 100644 --- a/object/resolve/peel_to_tree.go +++ b/object/resolve/peel_to_tree.go @@ -3,14 +3,16 @@ package resolve import ( "fmt" - "codeberg.org/lindenii/furgit/object" + "codeberg.org/lindenii/furgit/object/commit" objectid "codeberg.org/lindenii/furgit/object/id" "codeberg.org/lindenii/furgit/object/stored" + "codeberg.org/lindenii/furgit/object/tag" + "codeberg.org/lindenii/furgit/object/tree" ) // PeelToTree peels tags until it reaches a tree or commit. If it reaches a // commit, it returns the commit's root tree. -func (r *Resolver) PeelToTree(id objectid.ObjectID) (*stored.Stored[*object.Tree], error) { +func (r *Resolver) PeelToTree(id objectid.ObjectID) (*stored.Stored[*tree.Tree], error) { for { obj, err := r.ExactObject(id) if err != nil { @@ -18,11 +20,11 @@ func (r *Resolver) PeelToTree(id objectid.ObjectID) (*stored.Stored[*object.Tree } switch parsed := obj.Object().(type) { - case *object.Tree: + case *tree.Tree: return stored.New(id, parsed), nil - case *object.Commit: + case *commit.Commit: return r.ExactTree(parsed.Tree) - case *object.Tag: + case *tag.Tag: id = parsed.Target default: return nil, fmt.Errorf("object/resolve: expected tree-ish object %s, got %v", id, parsed.ObjectType()) |