aboutsummaryrefslogtreecommitdiffstats
path: root/plumbing/object/tree.go
diff options
context:
space:
mode:
authorOri Rawlings <orirawlings@gmail.com>2017-11-22 08:51:48 -0500
committerGitHub <noreply@github.com>2017-11-22 08:51:48 -0500
commitd9518b57cdc9701c0077d23db54558f496daea9f (patch)
tree26b5b11c236144ca68801f30de07627482d08e01 /plumbing/object/tree.go
parentb08cc8dc5450981530af3e6f6ad1159ae8ea8705 (diff)
parent458b90ec958fcfe4246be87ef85aad215c24256d (diff)
downloadgo-git-d9518b57cdc9701c0077d23db54558f496daea9f.tar.gz
Merge pull request #652 from ferhatelmas/err-return-on-tree-decode
plumbing/object: do not eat error on tree decode
Diffstat (limited to 'plumbing/object/tree.go')
-rw-r--r--plumbing/object/tree.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/plumbing/object/tree.go b/plumbing/object/tree.go
index 44ac720..2fcd979 100644
--- a/plumbing/object/tree.go
+++ b/plumbing/object/tree.go
@@ -136,9 +136,9 @@ func (t *Tree) dir(baseName string) (*Tree, error) {
}
tree := &Tree{s: t.s}
- tree.Decode(obj)
+ err = tree.Decode(obj)
- return tree, nil
+ return tree, err
}
var errEntryNotFound = errors.New("entry not found")