plumbing: transport, dry sideband caps and wrap errors

Co-authored-by: Paulo Gomes <[email protected]>

Update remote.go

Co-authored-by: Paulo Gomes <[email protected]>

Author: aymanbagabas

plumbing/transport/fetch.go

@@ -25,11 +25,10 @@ func FetchPack(
 	var demuxer *sideband.Demuxer
 	var reader io.Reader = packf
 	caps := conn.Capabilities()
-	if caps.Supports(capability.Sideband) {
-		demuxer = sideband.NewDemuxer(sideband.Sideband, reader)
-	}
 	if caps.Supports(capability.Sideband64k) {
 		demuxer = sideband.NewDemuxer(sideband.Sideband64k, reader)
+	} else if caps.Supports(capability.Sideband) {
+		demuxer = sideband.NewDemuxer(sideband.Sideband, reader)
 	}
 
 	if demuxer != nil && req.Progress != nil {

plumbing/transport/loader.go

@@ -49,7 +49,7 @@ func (l *fsLoader) load(ep *Endpoint, tried bool) (storage.Storer, error) {
 
 	if _, err := fs.Stat("config"); err != nil {
 		if !l.strict && !tried {
-			if _, err := fs.Stat(".git"); err == nil {
+			if fi, err := fs.Stat(".git"); err == nil && fi.IsDir() {
 				ep.Path = filepath.Join(ep.Path, ".git")
 			} else {
 				ep.Path = ep.Path + ".git"

plumbing/transport/negotiate.go

@@ -105,32 +105,32 @@ func NegotiatePack(
 	var shupd packp.ShallowUpdate
 	for !done {
 		if err := upreq.Encode(writer); err != nil {
-			return nil, fmt.Errorf("sending upload-request: %s", err)
+			return nil, fmt.Errorf("sending upload-request: %w", err)
 		}
 
 		// Encode upload-haves
 		// TODO: support multi_ack and multi_ack_detailed caps
 		if err := uphav.Encode(writer); err != nil {
-			return nil, fmt.Errorf("sending upload-haves: %s", err)
+			return nil, fmt.Errorf("sending upload-haves: %w", err)
 		}
 
 		// Note: Stateless RPC servers don't expect a flush-pkt after the
 		// haves. Sending one might result in a response without a packfile in
 		// return.
 		if !conn.StatelessRPC() && len(uphav.Haves) > 0 {
 			if err := pktline.WriteFlush(writer); err != nil {
-				return nil, fmt.Errorf("sending flush-pkt after haves: %s", err)
+				return nil, fmt.Errorf("sending flush-pkt after haves: %w", err)
 			}
 		}
 
 		// Let the server know we're done
 		if _, err := pktline.Writeln(writer, "done"); err != nil {
-			return nil, fmt.Errorf("sending done: %s", err)
+			return nil, fmt.Errorf("sending done: %w", err)
 		}
 
 		// Close the writer to signal the end of the request
 		if err := writer.Close(); err != nil {
-			return nil, fmt.Errorf("closing writer: %s", err)
+			return nil, fmt.Errorf("closing writer: %w", err)
 		}
 
 		// TODO: handle server-response to support incremental fetch i.e.
@@ -143,7 +143,7 @@ func NegotiatePack(
 		// server.
 		if req.Depth != 0 {
 			if err := shupd.Decode(reader); err != nil {
-				return nil, fmt.Errorf("decoding shallow-update: %s", err)
+				return nil, fmt.Errorf("decoding shallow-update: %w", err)
 			}
 		}
 
@@ -152,12 +152,12 @@ func NegotiatePack(
 		var acks bytes.Buffer
 		tee := io.TeeReader(reader, &acks)
 		if l, p, err := pktline.ReadLine(tee); err != nil {
-			return nil, fmt.Errorf("reading server-response, len: %d, pkt: %q: %s", l, p, err)
+			return nil, fmt.Errorf("reading server-response, len: %d, pkt: %q: %w", l, p, err)
 		}
 
 		// Decode server-response final ACK/NAK
 		if err := srvrs.Decode(&acks); err != nil {
-			return nil, fmt.Errorf("decoding server-response: %s", err)
+			return nil, fmt.Errorf("decoding server-response: %w", err)
 		}
 
 	}

plumbing/transport/receive_pack.go

@@ -86,7 +86,7 @@ func ReceivePack(
 	// Done with the request, now close the reader
 	// to indicate that we are done reading from it.
 	if err := r.Close(); err != nil {
-		return fmt.Errorf("closing reader: %s", err)
+		return fmt.Errorf("closing reader: %w", err)
 	}
 
 	// Report status if the client supports it
@@ -133,7 +133,7 @@ func sendReportStatus(w io.WriteCloser, unpackErr error, cmdStatus map[plumbing.
 	}
 
 	if err := w.Close(); err != nil {
-		return fmt.Errorf("closing writer: %s", err)
+		return fmt.Errorf("closing writer: %w", err)
 	}
 
 	return nil

plumbing/transport/serve.go

@@ -35,7 +35,6 @@ func AdvertiseReferences(ctx context.Context, st storage.Storer, w io.Writer, se
 	} else {
 		// TODO: support multi_ack and multi_ack_detailed caps
 		// TODO: support include-tag
-		// TODO: support shallow
 		// TODO: support deepen
 		// TODO: support deepen-since
 		ar.Capabilities.Set(capability.Sideband)   //nolint:errcheck

plumbing/transport/upload_pack.go

@@ -109,7 +109,7 @@ func UploadPack(
 		// Done with the request, now close the reader
 		// to indicate that we are done reading from it.
 		if err := r.Close(); err != nil {
-			return fmt.Errorf("closing reader: %s", err)
+			return fmt.Errorf("closing reader: %w", err)
 		}
 
 		// TODO: support deepen, deepen-since, and deepen-not
@@ -142,11 +142,10 @@ func UploadPack(
 
 		var writer io.Writer = w
 		if !caps.Supports(capability.NoProgress) {
-			if caps.Supports(capability.Sideband) {
-				writer = sideband.NewMuxer(sideband.Sideband, w)
-			}
 			if caps.Supports(capability.Sideband64k) {
 				writer = sideband.NewMuxer(sideband.Sideband64k, w)
+			} else if caps.Supports(capability.Sideband) {
+				writer = sideband.NewMuxer(sideband.Sideband, w)
 			}
 		}
 
@@ -159,7 +158,7 @@ func UploadPack(
 		}
 
 		if err := w.Close(); err != nil {
-			return fmt.Errorf("closing writer: %s", err)
+			return fmt.Errorf("closing writer: %w", err)
 		}
 	}
 

remote.go

@@ -450,7 +450,7 @@ func (r *Remote) fetch(ctx context.Context, o *FetchOptions) (sto storer.Referen
 	}
 
 	if err := conn.Close(); err != nil {
-		return nil, fmt.Errorf("error closing connection: %v", err)
+		return nil, fmt.Errorf("error closing connection: %w", err)
 	}
 
 	var updatedPrune bool