diff options
| -rw-r--r-- | repository/gogit.go | 27 | ||||
| -rw-r--r-- | repository/repo.go | 1 |
2 files changed, 25 insertions, 3 deletions
diff --git a/repository/gogit.go b/repository/gogit.go index 684f8a72..6d3aede9 100644 --- a/repository/gogit.go +++ b/repository/gogit.go @@ -333,13 +333,34 @@ func (repo *GoGitRepo) StoreTree(mapping []TreeEntry) (Hash, error) { // ReadTree will return the list of entries in a Git tree func (repo *GoGitRepo) ReadTree(hash Hash) ([]TreeEntry, error) { - obj, err := repo.r.TreeObject(plumbing.NewHash(hash.String())) + h := plumbing.NewHash(hash.String()) + + // the given hash could be a tree or a commit + obj, err := repo.r.Storer.EncodedObject(plumbing.AnyObject, h) + if err != nil { + return nil, err + } + + var tree *object.Tree + switch obj.Type() { + case plumbing.TreeObject: + tree, err = object.DecodeTree(repo.r.Storer, obj) + case plumbing.CommitObject: + var commit *object.Commit + commit, err = object.DecodeCommit(repo.r.Storer, obj) + if err != nil { + return nil, err + } + tree, err = commit.Tree() + default: + return nil, fmt.Errorf("given hash is not a tree") + } if err != nil { return nil, err } - treeEntries := make([]TreeEntry, len(obj.Entries)) - for i, entry := range obj.Entries { + treeEntries := make([]TreeEntry, len(tree.Entries)) + for i, entry := range tree.Entries { objType := Blob if entry.Mode == filemode.Dir { objType = Tree diff --git a/repository/repo.go b/repository/repo.go index 2eb27e82..4b45a1c5 100644 --- a/repository/repo.go +++ b/repository/repo.go @@ -82,6 +82,7 @@ type RepoData interface { StoreTree(mapping []TreeEntry) (Hash, error) // ReadTree will return the list of entries in a Git tree + // The given hash could be from either a commit or a tree ReadTree(hash Hash) ([]TreeEntry, error) // StoreCommit will store a Git commit with the given Git tree |