Merge pull request #58 from go-git/renovate/golangci-golangci-lint-2.x

build: Update dependency golangci/golangci-lint to v2.6.2

Author: pjbgf

Makefile

@@ -2,7 +2,7 @@ GOCMD = go
 GOTEST = $(GOCMD) test 
 
 # renovate: datasource=github-tags depName=golangci/golangci-lint
-GOLANGCI_VERSION ?= v2.1.6
+GOLANGCI_VERSION ?= v2.6.2
 TOOLS_BIN := $(shell mkdir -p build/tools && realpath build/tools)
 
 GOLANGCI = $(TOOLS_BIN)/golangci-lint-$(GOLANGCI_VERSION)

fixtures.go

@@ -232,13 +232,7 @@ type Fixture struct {
 }
 
 func (f *Fixture) Is(tag string) bool {
-	for _, t := range f.Tags {
-		if t == tag {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(f.Tags, tag)
 }
 
 func (f *Fixture) Packfile() billy.File {
@@ -316,7 +310,8 @@ func (f *Fixture) Clone() *Fixture {
 
 // EnsureIsBare overrides the config file with one where bare is true.
 func EnsureIsBare(fs billy.Filesystem) error {
-	if _, err := fs.Stat("config"); err != nil {
+	_, err := fs.Stat("config")
+	if err != nil {
 		return fmt.Errorf("not .git folder: %w", err)
 	}
 
@@ -370,6 +365,7 @@ type Fixtures []*Fixture
 // Run calls test within a t.Run for each fixture in g.
 func (g Fixtures) Run(t *testing.T, test func(*testing.T, *Fixture)) {
 	t.Helper()
+
 	for _, f := range g {
 		name := fmt.Sprintf("fixture run (%q, %q)", f.URL, f.Tags)
 		t.Run(name, func(t *testing.T) {

fixtures_test.go

@@ -71,13 +71,15 @@ func TestRevFiles(t *testing.T) {
 
 func TestAll(t *testing.T) {
 	t.Parallel()
+
 	fs := fixtures.All()
 
 	assert.Len(t, fs, 39)
 }
 
 func TestByTag(t *testing.T) {
 	t.Parallel()
+
 	tests := []struct {
 		tag string
 		len int

internal/tgz/tgz.go

@@ -62,6 +62,7 @@ func filemode(mode int64) (fs.FileMode, error) {
 	if mode < 0 {
 		return 0, ErrCannotBeNegative
 	}
+
 	if mode > math.MaxUint32 {
 		return 0, ErrCannotBeGreaterThanMaxUInt32
 	}
@@ -81,10 +82,12 @@ func unTar(fs billy.Filesystem, src *tar.Reader) error {
 		}
 
 		dst := header.Name
+
 		mode, err := filemode(header.Mode)
 		if err != nil {
 			return err
 		}
+
 		switch header.Typeflag {
 		case tar.TypeDir:
 			err := fs.MkdirAll(dst, mode)
@@ -110,6 +113,7 @@ func makeFile(fs billy.Filesystem, path string, mode os.FileMode, contents io.Re
 	if err != nil {
 		return err
 	}
+
 	defer func() {
 		errClose := w.Close()
 		if err == nil {
@@ -123,7 +127,8 @@ func makeFile(fs billy.Filesystem, path string, mode os.FileMode, contents io.Re
 	}
 
 	if fs, ok := fs.(billy.Change); ok {
-		if err = fs.Chmod(path, mode); err != nil {
+		err = fs.Chmod(path, mode)
+		if err != nil {
 			return err
 		}
 	}

internal/tgz/tgz_test.go

@@ -45,6 +45,7 @@ func TestExtractError(t *testing.T) {
 			require.NoError(t, err)
 
 			source := osfs.New(d + "/fixtures")
+
 			f, err := source.Open(tc.tgz)
 			if tc.notFound {
 				require.ErrorIs(t, err, os.ErrNotExist)

osfixture.go

@@ -9,16 +9,17 @@ import (
 )
 
 type OSFixture struct {
-	dir string
 	*Fixture
+
+	dir string
 }
 
 // NewOSFixture converts a Fixture which is based on embedfs, into
 // an OS based fixture.
 func NewOSFixture(f *Fixture, dir string) *OSFixture {
 	return &OSFixture{
-		dir:     dir,
 		Fixture: f,
+		dir:     dir,
 	}
 }
 
@@ -67,6 +68,7 @@ func embedToOsfs(dir string, f billy.File) billy.File {
 	defer f.Close()
 
 	fs := osfs.New(dir)
+
 	out, err := fs.TempFile("", "embed")
 	if err != nil {
 		panic(err)