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 /repository.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 'repository.go')
| -rw-r--r-- | repository.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/repository.go b/repository.go index cce7097..0e741a7 100644 --- a/repository.go +++ b/repository.go @@ -79,9 +79,7 @@ func (r *Repository) Pull(remoteName, branch string) (err error) { if err != nil { return err } - defer func() { - err = reader.Close() - }() + defer close(reader, &err) pr := packfile.NewReader(reader) if _, err = pr.Read(r.Storage); err != nil { |