Skip to content

Commit 1c44cc9

Browse files
codechamp1codechamp1
committed
build: remove replace directive and upgrade to latest go-billy/v6 and go-git-fixtures/v5. Fixes go-git#1592 
1 parent 20c25df commit 1c44cc9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+301
-307
lines changed

‎_examples/ls/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"github.com/go-git/go-git/v6/plumbing/object/commitgraph"
1818
"github.com/go-git/go-git/v6/storage/filesystem"
1919

20-
"github.com/go-git/go-billy/v5"
21-
"github.com/go-git/go-billy/v5/osfs"
20+
"github.com/go-git/go-billy/v6"
21+
"github.com/go-git/go-billy/v6/osfs"
2222
)
2323

2424
// Example how to resolve a revision into its commit counterpart

‎_examples/memory/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"os"
66

7-
"github.com/go-git/go-billy/v5/memfs"
7+
"github.com/go-git/go-billy/v6/memfs"
88
"github.com/go-git/go-git/v6"
99
. "github.com/go-git/go-git/v6/_examples"
1010
"github.com/go-git/go-git/v6/storage/memory"

‎common_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"github.com/stretchr/testify/assert"
1616
"github.com/stretchr/testify/suite"
1717

18-
"github.com/go-git/go-billy/v5"
19-
"github.com/go-git/go-billy/v5/memfs"
20-
"github.com/go-git/go-billy/v5/osfs"
21-
"github.com/go-git/go-billy/v5/util"
18+
"github.com/go-git/go-billy/v6"
19+
"github.com/go-git/go-billy/v6/memfs"
20+
"github.com/go-git/go-billy/v6/osfs"
21+
"github.com/go-git/go-billy/v6/util"
2222
fixtures "github.com/go-git/go-git-fixtures/v5"
2323
)
2424

‎config/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"sort"
1212
"strconv"
1313

14-
"github.com/go-git/go-billy/v5/osfs"
14+
"github.com/go-git/go-billy/v6/osfs"
1515
"github.com/go-git/go-git/v6/internal/url"
1616
"github.com/go-git/go-git/v6/plumbing"
1717
format "github.com/go-git/go-git/v6/plumbing/format/config"

‎config/config_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"strings"
77
"testing"
88

9-
"github.com/go-git/go-billy/v5/osfs"
10-
"github.com/go-git/go-billy/v5/util"
9+
"github.com/go-git/go-billy/v6/osfs"
10+
"github.com/go-git/go-billy/v6/util"
1111
"github.com/go-git/go-git/v6/plumbing"
1212
"github.com/go-git/go-git/v6/plumbing/protocol"
1313
"github.com/stretchr/testify/suite"

‎example_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/go-git/go-git/v6/plumbing/transport/http"
1414
"github.com/go-git/go-git/v6/storage/memory"
1515

16-
"github.com/go-git/go-billy/v5/memfs"
16+
"github.com/go-git/go-billy/v6/memfs"
1717
)
1818

1919
func ExampleClone() {

‎go.mod‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ go 1.23.0
55

66
toolchain go1.23.7
77

8-
// Use the v6-exp branch across go-git dependencies.
9-
replace (
10-
github.com/go-git/go-billy/v5 => github.com/go-git/go-billy/v5 v5.5.1-0.20250112183528-18f878617b0e
11-
github.com/go-git/go-git-fixtures/v5 => github.com/go-git/go-git-fixtures/v5 v5.0.0-20241203230421-0753e18f8f03
12-
)
13-
148
require (
159
dario.cat/mergo v1.0.1
1610
github.com/Microsoft/go-winio v0.6.2
@@ -20,8 +14,8 @@ require (
2014
github.com/emirpasic/gods v1.18.1
2115
github.com/gliderlabs/ssh v0.3.8
2216
github.com/go-git/gcfg/v2 v2.0.2
23-
github.com/go-git/go-billy/v5 v5.6.2
24-
github.com/go-git/go-git-fixtures/v5 v5.0.0-20241203230421-0753e18f8f03
17+
github.com/go-git/go-billy/v6 v6.0.0-20250627091229-31e2a16eef30
18+
github.com/go-git/go-git-fixtures/v5 v5.1.0
2519
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8
2620
github.com/kevinburke/ssh_config v1.2.0
2721
github.com/pjbgf/sha1cd v0.3.2

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
2424
github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
2525
github.com/go-git/gcfg/v2 v2.0.2 h1:MY5SIIfTGGEMhdA7d7JePuVVxtKL7Hp+ApGDJAJ7dpo=
2626
github.com/go-git/gcfg/v2 v2.0.2/go.mod h1:/lv2NsxvhepuMrldsFilrgct6pxzpGdSRC13ydTLSLs=
27-
github.com/go-git/go-billy/v5 v5.5.1-0.20250112183528-18f878617b0e h1:3AG0UOghlvUIcy9IuH9WXL+/AFz59bu/HCjycG78yl8=
28-
github.com/go-git/go-billy/v5 v5.5.1-0.20250112183528-18f878617b0e/go.mod h1:1B6rEdNBj35pFhqC8nx/d+Kg6ENsneqc/aIhZaTtAAk=
29-
github.com/go-git/go-git-fixtures/v5 v5.0.0-20241203230421-0753e18f8f03 h1:LumE+tQdnYW24a9RoO08w64LHTzkNkdUqBD/0QPtlEY=
30-
github.com/go-git/go-git-fixtures/v5 v5.0.0-20241203230421-0753e18f8f03/go.mod h1:hMKrMnUE4W0SJ7bFyM00dyz/HoknZoptGWzrj6M+dEM=
27+
github.com/go-git/go-billy/v6 v6.0.0-20250627091229-31e2a16eef30 h1:4KqVJTL5eanN8Sgg3BV6f2/QzfZEFbCd+rTak1fGRRA=
28+
github.com/go-git/go-billy/v6 v6.0.0-20250627091229-31e2a16eef30/go.mod h1:snwvGrbywVFy2d6KJdQ132zapq4aLyzLMgpo79XdEfM=
29+
github.com/go-git/go-git-fixtures/v5 v5.1.0 h1:b8cWxDLTk0s09Ihm9x1HvNGUzxUVlRwIH7EAM0gGDKg=
30+
github.com/go-git/go-git-fixtures/v5 v5.1.0/go.mod h1:CdmU0oQeDuy4Xh8V0i9Ym+vsTkgDDPKEiofBFEVT+aE=
3131
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
3232
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
3333
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=

‎internal/transport/test/common.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"path/filepath"
66
"testing"
77

8-
"github.com/go-git/go-billy/v5"
8+
"github.com/go-git/go-billy/v6"
99
fixtures "github.com/go-git/go-git-fixtures/v5"
1010
"github.com/stretchr/testify/require"
1111
)

‎options_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"os"
55
"testing"
66

7-
"github.com/go-git/go-billy/v5/util"
7+
"github.com/go-git/go-billy/v6/util"
88
"github.com/go-git/go-git/v6/config"
99
"github.com/go-git/go-git/v6/plumbing"
1010
"github.com/go-git/go-git/v6/plumbing/object"

0 commit comments

Comments
 (0)