From dc45de29f87a43078356a5be4c4b5aa24f626ee0 Mon Sep 17 00:00:00 2001 From: Antonio Navarro Perez Date: Wed, 25 Jan 2017 00:30:09 +0100 Subject: transport/http: fix partial request with haves. Fix #216. (#221) --- plumbing/protocol/packp/uppackreq.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'plumbing/protocol/packp/uppackreq.go') diff --git a/plumbing/protocol/packp/uppackreq.go b/plumbing/protocol/packp/uppackreq.go index 84e2b4e..4bb22d0 100644 --- a/plumbing/protocol/packp/uppackreq.go +++ b/plumbing/protocol/packp/uppackreq.go @@ -68,8 +68,9 @@ type UploadHaves struct { Haves []plumbing.Hash } -// Encode encodes the UploadHaves into the Writer. -func (u *UploadHaves) Encode(w io.Writer) error { +// Encode encodes the UploadHaves into the Writer. If flush is true, a flush +// command will be encoded at the end of the writer content. +func (u *UploadHaves) Encode(w io.Writer, flush bool) error { e := pktline.NewEncoder(w) plumbing.HashesSort(u.Haves) @@ -87,7 +88,7 @@ func (u *UploadHaves) Encode(w io.Writer) error { last = have } - if len(u.Haves) != 0 { + if flush && len(u.Haves) != 0 { if err := e.Flush(); err != nil { return fmt.Errorf("sending flush-pkt after haves: %s", err) } -- cgit