From 22fe81f342538ae51442a72356036768f7f1a2f9 Mon Sep 17 00:00:00 2001 From: Máximo Cuadros Date: Tue, 6 Dec 2016 15:46:09 +0100 Subject: protocol/packp: UploadPackResponse implementation (#161) * plumbing/protocol: paktp avoid duplication of haves, wants and shallow * protocol/pakp: UploadPackResponse implementation * changes * changes * changes * debug * changes --- plumbing/protocol/packp/uppackreq.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'plumbing/protocol/packp/uppackreq.go') diff --git a/plumbing/protocol/packp/uppackreq.go b/plumbing/protocol/packp/uppackreq.go index 887d27a..84e2b4e 100644 --- a/plumbing/protocol/packp/uppackreq.go +++ b/plumbing/protocol/packp/uppackreq.go @@ -13,15 +13,16 @@ import ( // UploadPackRequest represents a upload-pack request. // Zero-value is not safe, use NewUploadPackRequest instead. type UploadPackRequest struct { - *UploadRequest - *UploadHaves + UploadRequest + UploadHaves } // NewUploadPackRequest creates a new UploadPackRequest and returns a pointer. func NewUploadPackRequest() *UploadPackRequest { + ur := NewUploadRequest() return &UploadPackRequest{ - UploadHaves: &UploadHaves{}, - UploadRequest: NewUploadRequest(), + UploadHaves: UploadHaves{}, + UploadRequest: *ur, } } @@ -30,9 +31,10 @@ func NewUploadPackRequest() *UploadPackRequest { // ones, based on the adv value (advertaised capabilities), the UploadPackRequest // it has no wants, haves or shallows and an infinite depth func NewUploadPackRequestFromCapabilities(adv *capability.List) *UploadPackRequest { + ur := NewUploadRequestFromCapabilities(adv) return &UploadPackRequest{ - UploadHaves: &UploadHaves{}, - UploadRequest: NewUploadRequestFromCapabilities(adv), + UploadHaves: UploadHaves{}, + UploadRequest: *ur, } } -- cgit