diff options
author | Joshua Sjoding <joshua.sjoding@scjalliance.com> | 2016-02-24 22:40:30 -0800 |
---|---|---|
committer | Joshua Sjoding <joshua.sjoding@scjalliance.com> | 2016-02-25 00:38:51 -0800 |
commit | 0d999e1db6cd8736ab697de8ce848fa3a5274b9f (patch) | |
tree | 6107f49405bb605793f1bcd7ef4961ceadcb11e9 /commit.go | |
parent | 07ca1ac7f3058ea6d3274a01973541fb84782f5e (diff) | |
download | go-git-0d999e1db6cd8736ab697de8ce848fa3a5274b9f.tar.gz |
Refactor to use core.ObjectReader and core.ObjectWriter
* New function signatures provide the necessary interface to stream data from disk when using filesystem-based storage in the future
* New function signatures provide proper error handling
* ObjectReader and ObjectWriter interfaces added to avoid future refactoring, currently are type aliases for io.ReadCloser and io.WriteCloser respectively
* Object.Reader now returns (ObjectReader, error)
* Object.Writer now returns (ObjectWriter, error)
* File.Contents now returns (string, error)
* File.Lines now returns ([]string, error)
* Blob.Reader now returns (core.ObjectReader, error)
* Added internal close helper function for deferred calls to Close that need to check the return value
Diffstat (limited to 'commit.go')
-rw-r--r-- | commit.go | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -50,13 +50,20 @@ func (c *Commit) File(path string) (file *File, err error) { } // Decode transform an core.Object into a Blob struct -func (c *Commit) Decode(o core.Object) error { +func (c *Commit) Decode(o core.Object) (err error) { if o.Type() != core.CommitObject { return ErrUnsupportedObject } c.Hash = o.Hash() - r := bufio.NewReader(o.Reader()) + + reader, err := o.Reader() + if err != nil { + return err + } + defer close(reader, &err) + + r := bufio.NewReader(reader) var message bool for { |