diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2021-05-02 23:36:12 +0200 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2021-05-02 23:36:12 +0200 |
| commit | 67af9d7223b0cc643025d958c592291f7475ac75 (patch) | |
| tree | a8d14d0e88fd57ae84c2614d7c2fb9c6527438a5 /plumbing | |
| parent | c69d5331743e49d3672897cf1c552e5e123d4509 (diff) | |
| download | go-git-67af9d7223b0cc643025d958c592291f7475ac75.tar.gz | |
utils: ioutil, Pipe implementatio
Diffstat (limited to 'plumbing')
| -rw-r--r-- | plumbing/transport/file/client.go | 3 | ||||
| -rw-r--r-- | plumbing/transport/server/server.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/plumbing/transport/file/client.go b/plumbing/transport/file/client.go index 38714e2..6f0a380 100644 --- a/plumbing/transport/file/client.go +++ b/plumbing/transport/file/client.go @@ -11,6 +11,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/transport" "github.com/go-git/go-git/v5/plumbing/transport/internal/common" + "github.com/go-git/go-git/v5/utils/ioutil" "golang.org/x/sys/execabs" ) @@ -111,7 +112,7 @@ func (c *command) Start() error { func (c *command) StderrPipe() (io.Reader, error) { // Pipe returned by Command.StderrPipe has a race with Read + Command.Wait. // We use an io.Pipe and close it after the command finishes. - r, w := io.Pipe() + r, w := ioutil.Pipe() c.cmd.Stderr = w c.stderrCloser = r return r, nil diff --git a/plumbing/transport/server/server.go b/plumbing/transport/server/server.go index 6f89ec3..8ab70fe 100644 --- a/plumbing/transport/server/server.go +++ b/plumbing/transport/server/server.go @@ -166,7 +166,7 @@ func (s *upSession) UploadPack(ctx context.Context, req *packp.UploadPackRequest return nil, err } - pr, pw := io.Pipe() + pr, pw := ioutil.Pipe() e := packfile.NewEncoder(pw, s.storer, false) go func() { // TODO: plumb through a pack window. |