Merge pull request #1634 from sashamelentyev/cleanup

pjbgf · web-flow · commit ebc56f97b3d2 · 2025-09-23T09:07:31.000+01:00
utils: rm redundant dep and cleanup
diff --git a/go.mod b/go.mod
@@ -22,7 +22,6 @@ require (
 	github.com/sergi/go-diff v1.4.0
 	github.com/stretchr/testify v1.11.1
 	golang.org/x/crypto v0.41.0
-	golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b
 	golang.org/x/net v0.43.0
 	golang.org/x/sys v0.35.0
 	golang.org/x/text v0.28.0
diff --git a/go.sum b/go.sum
@@ -58,8 +58,6 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
 golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
-golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b h1:QoALfVG9rhQ/M7vYDScfPdWjGL9dlsVVM5VGh7aKoAA=
-golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ=
 golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
 golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
 golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
diff --git a/plumbing/format/packfile/packfile.go b/plumbing/format/packfile/packfile.go
@@ -4,7 +4,6 @@ import (
 	"crypto"
 	"fmt"
 	"io"
-	"os"
 	"sync"
 
 	billy "github.com/go-git/go-billy/v6"
@@ -349,8 +348,3 @@ func (p *Packfile) getMemoryObject(oh *ObjectHeader) (plumbing.EncodedObject, er
 
 	return obj, nil
 }
-
-// errInvalidWindows is the Windows equivalent to os.ErrInvalid
-const errInvalidWindows = "The parameter is incorrect."
-
-var errInvalidUnix = os.ErrInvalid.Error()
diff --git a/plumbing/format/packfile/parser_cache.go b/plumbing/format/packfile/parser_cache.go
@@ -4,7 +4,6 @@ import (
 	"slices"
 
 	"github.com/go-git/go-git/v6/plumbing"
-	"golang.org/x/exp/maps"
 )
 
 func newParserCache() *parserCache {
@@ -36,7 +35,7 @@ func (c *parserCache) Reset(n int) {
 		c.oi = c.oi[:0]
 		c.oi = slices.Grow(c.oi, n)
 
-		maps.Clear(c.oiByHash)
-		maps.Clear(c.oiByOffset)
+		clear(c.oiByHash)
+		clear(c.oiByOffset)
 	}
 }
diff --git a/remote.go b/remote.go
@@ -19,7 +19,6 @@ import (
 	"github.com/go-git/go-git/v6/plumbing/object"
 	"github.com/go-git/go-git/v6/plumbing/protocol/packp"
 	"github.com/go-git/go-git/v6/plumbing/protocol/packp/capability"
-	"github.com/go-git/go-git/v6/plumbing/protocol/packp/sideband"
 	"github.com/go-git/go-git/v6/plumbing/revlist"
 	"github.com/go-git/go-git/v6/plumbing/storer"
 	"github.com/go-git/go-git/v6/plumbing/transport"
@@ -1091,24 +1090,6 @@ func (r *Remote) isSupportedRefSpec(refs []config.RefSpec, caps *capability.List
 	return ErrExactSHA1NotSupported
 }
 
-func buildSidebandIfSupported(l *capability.List, reader io.Reader, p sideband.Progress) io.Reader {
-	var t sideband.Type
-
-	switch {
-	case l.Supports(capability.Sideband):
-		t = sideband.Sideband
-	case l.Supports(capability.Sideband64k):
-		t = sideband.Sideband64k
-	default:
-		return reader
-	}
-
-	d := sideband.NewDemuxer(t, reader)
-	d.Progress = p
-
-	return d
-}
-
 func (r *Remote) updateLocalReferenceStorage(
 	specs []config.RefSpec,
 	fetchedRefs, remoteRefs memory.ReferenceStorage,
diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go
@@ -464,13 +464,6 @@ func (s *ObjectStorage) getFromUnpacked(h plumbing.Hash) (obj plumbing.EncodedOb
 	return obj, nil
 }
 
-var copyBufferPool = sync.Pool{
-	New: func() interface{} {
-		b := make([]byte, 32*1024)
-		return &b
-	},
-}
-
 // Get returns the object with the given hash, by searching for it in
 // the packfile.
 func (s *ObjectStorage) getFromPackfile(h plumbing.Hash, canBeDelta bool) (plumbing.EncodedObject, error) {
diff --git a/utils/ioutil/context_test.go b/utils/ioutil/context_test.go
@@ -2,11 +2,10 @@ package ioutil
 
 import (
 	"bytes"
+	"context"
 	"io"
 	"testing"
 	"time"
-
-	context "golang.org/x/net/context"
 )
 
 func TestReader(t *testing.T) {
@@ -60,7 +59,7 @@ func TestWriter(t *testing.T) {
 	if err != nil {
 		t.Error("should have no error")
 	}
-	if string(buf.Bytes()) != string("abc") {
+	if buf.String() != "abc" {
 		t.Error("incorrect contents")
 	}
 
@@ -72,7 +71,7 @@ func TestWriter(t *testing.T) {
 	if err != nil {
 		t.Error("should have no error")
 	}
-	if string(buf.Bytes()) != string("abcdef") {
+	if buf.String() != "abcdef" {
 		t.Error("incorrect contents")
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import (`
`4`	`4`	`"slices"`
`5`	`5`
`6`	`6`	`"github.com/go-git/go-git/v6/plumbing"`
`7`		`- "golang.org/x/exp/maps"`
`8`	`7`	`)`
`9`	`8`
`10`	`9`	`func newParserCache() *parserCache {`
`@@ -36,7 +35,7 @@ func (c *parserCache) Reset(n int) {`
`36`	`35`	`c.oi = c.oi[:0]`
`37`	`36`	`c.oi = slices.Grow(c.oi, n)`
`38`	`37`
`39`		`- maps.Clear(c.oiByHash)`
`40`		`- maps.Clear(c.oiByOffset)`
	`38`	`+ clear(c.oiByHash)`
	`39`	`+ clear(c.oiByOffset)`
`41`	`40`	`}`
`42`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,10 @@ package ioutil`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`
	`5`	`+ "context"`
`5`	`6`	`"io"`
`6`	`7`	`"testing"`
`7`	`8`	`"time"`
`8`		`-`
`9`		`- context "golang.org/x/net/context"`
`10`	`9`	`)`
`11`	`10`
`12`	`11`	`func TestReader(t *testing.T) {`
`@@ -60,7 +59,7 @@ func TestWriter(t *testing.T) {`
`60`	`59`	`if err != nil {`
`61`	`60`	`t.Error("should have no error")`
`62`	`61`	`}`
`63`		`- if string(buf.Bytes()) != string("abc") {`
	`62`	`+ if buf.String() != "abc" {`
`64`	`63`	`t.Error("incorrect contents")`
`65`	`64`	`}`
`66`	`65`
`@@ -72,7 +71,7 @@ func TestWriter(t *testing.T) {`
`72`	`71`	`if err != nil {`
`73`	`72`	`t.Error("should have no error")`
`74`	`73`	`}`
`75`		`- if string(buf.Bytes()) != string("abcdef") {`
	`74`	`+ if buf.String() != "abcdef" {`
`76`	`75`	`t.Error("incorrect contents")`
`77`	`76`	`}`
`78`	`77`	`}`