aboutsummaryrefslogtreecommitdiffstats
path: root/remote.go
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2017-07-25 16:14:32 +0200
committerGitHub <noreply@github.com>2017-07-25 16:14:32 +0200
commitfbf2a4ab4588c78e3d9d0265dba774ae6b388b5f (patch)
tree883e9172499234f9f258fb41190fcd0f9134c0a4 /remote.go
parent25a0420bc0544f826e5517365e986d83bbb926c8 (diff)
parentdb5fa522f36207684ec0d67b98cac6313f0259b6 (diff)
downloadgo-git-fbf2a4ab4588c78e3d9d0265dba774ae6b388b5f.tar.gz
Merge pull request #507 from mcuadros/ctx
transport: context package support allowing cancellation of any network operation
Diffstat (limited to 'remote.go')
-rw-r--r--remote.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/remote.go b/remote.go
index 48b3c3d..64b12ed 100644
--- a/remote.go
+++ b/remote.go
@@ -1,6 +1,7 @@
package git
import (
+ "context"
"errors"
"fmt"
"io"
@@ -270,7 +271,7 @@ func newClient(url string) (transport.Transport, transport.Endpoint, error) {
func (r *Remote) fetchPack(o *FetchOptions, s transport.UploadPackSession,
req *packp.UploadPackRequest) (err error) {
- reader, err := s.UploadPack(req)
+ reader, err := s.UploadPack(context.TODO(), req)
if err != nil {
return err
}
@@ -713,7 +714,7 @@ func pushHashes(sess transport.ReceivePackSession, sto storer.EncodedObjectStore
done <- wr.Close()
}()
- rs, err := sess.ReceivePack(req)
+ rs, err := sess.ReceivePack(context.TODO(), req)
if err != nil {
return nil, err
}