Merge pull request #650 from pjbgf/upstream-billy

git/gogit: Replaces `fs` with upstream `osfs.BoundOS`

git/gogit/client.go

@@ -27,6 +27,7 @@ import (
 
 	"github.com/go-git/go-billy/v5"
 	"github.com/go-git/go-billy/v5/memfs"
+	"github.com/go-git/go-billy/v5/osfs"
 	extgogit "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
@@ -39,7 +40,6 @@ import (
 	"github.com/go-git/go-git/v5/storage/memory"
 
 	"github.com/fluxcd/pkg/git"
-	"github.com/fluxcd/pkg/git/gogit/fs"
 	"github.com/fluxcd/pkg/git/repository"
 )
 
@@ -159,8 +159,8 @@ func WithSingleBranch(singleBranch bool) ClientOption {
 // Git related objects on disk.
 func WithDiskStorage() ClientOption {
 	return func(c *Client) error {
-		wt := fs.New(c.path)
-		dot := fs.New(filepath.Join(c.path, extgogit.GitDirName))
+		wt := osfs.New(c.path, osfs.WithBoundOS())
+		dot := osfs.New(filepath.Join(c.path, extgogit.GitDirName), osfs.WithBoundOS())
 
 		c.storer = filesystem.NewStorage(dot, cache.NewObjectLRUDefault())
 		c.worktreeFS = wt

git/gogit/clone_test.go

@@ -34,6 +34,7 @@ import (
 
 	"github.com/elazarl/goproxy"
 	"github.com/go-git/go-billy/v5/memfs"
+	"github.com/go-git/go-billy/v5/osfs"
 	extgogit "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
@@ -46,7 +47,6 @@ import (
 
 	"github.com/fluxcd/gitkit"
 	"github.com/fluxcd/pkg/git"
-	"github.com/fluxcd/pkg/git/gogit/fs"
 	"github.com/fluxcd/pkg/git/repository"
 	"github.com/fluxcd/pkg/gittestserver"
 	"github.com/fluxcd/pkg/ssh"
@@ -1556,7 +1556,7 @@ func Fuzz_GoGitError(f *testing.F) {
 }
 
 func initRepo(tmpDir string) (*extgogit.Repository, string, error) {
-	sto := filesystem.NewStorage(fs.New(tmpDir), cache.NewObjectLRUDefault())
+	sto := filesystem.NewStorage(osfs.New(tmpDir, osfs.WithBoundOS()), cache.NewObjectLRUDefault())
 	repo, err := extgogit.Init(sto, memfs.New())
 	if err != nil {
 		return nil, "", err