From 0d999e1db6cd8736ab697de8ce848fa3a5274b9f Mon Sep 17 00:00:00 2001 From: Joshua Sjoding Date: Wed, 24 Feb 2016 22:40:30 -0800 Subject: 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 --- repository.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'repository.go') 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 { -- cgit