Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git: Bump to latest fluxcd/go-git #424

Merged
merged 7 commits into from
Dec 8, 2022
Merged

git: Bump to latest fluxcd/go-git #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a85e4cf
git/fs: Fix wd detected as outside wd
Dec 6, 2022
e908589
git/e2e: Ensure repos are initialised in new dir
Dec 6, 2022
51f482b
git/libgit2: Ensure only Flux fs is used
Dec 6, 2022
49c90f6
build: Bump fluxcd/go-git
Dec 6, 2022
80ff3d5
gogit: Auto-stage files from WithFiles
Dec 6, 2022
ebfa51a
git/e2e: Ensure changes are staged
Dec 6, 2022
f51bdb9
libgit2: Adhoc fix for darwin
Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 10 additions & 6 deletions git/gogit/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,23 +265,27 @@ func (g *Client) Commit(info git.Commit, commitOpts ...repository.CommitOption)
o(options)
}

wt, err := g.repository.Worktree()
if err != nil {
return "", err
}

var changed bool
for path, content := range options.Files {
if err := g.writeFile(path, content); err != nil {
return "", err
}
}

wt, err := g.repository.Worktree()
if err != nil {
return "", err
if _, err = wt.Add(path); err != nil {
return "", fmt.Errorf("cannot stage file %s: %w", path, err)
}
changed = true
}

status, err := wt.Status()
if err != nil {
return "", err
}

var changed bool
for file := range status {
_, _ = wt.Add(file)
changed = true
Expand Down
2 changes: 1 addition & 1 deletion git/gogit/fs/osfs_os.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ func (fs *OS) insideWorkingDirEval(filename string) (bool, error) {
if wd == "" || os.IsNotExist(err) {
wd = fs.workingDir
}
if dir != wd && !strings.HasPrefix(dir, wd+string(filepath.Separator)) {
if filename != wd && dir != wd && !strings.HasPrefix(dir, wd+string(filepath.Separator)) {
return false, fmt.Errorf("path outside working dir")
}
return true, nil
Expand Down
6 changes: 3 additions & 3 deletions git/gogit/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ require (
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819
github.com/fluxcd/gitkit v0.6.0
github.com/fluxcd/go-git/v5 v5.0.0-20221201130529-11e609450f0f
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df
github.com/fluxcd/pkg/git v0.7.0
github.com/fluxcd/pkg/gittestserver v0.8.0
github.com/fluxcd/pkg/gittestserver v0.0.0-00010101000000-000000000000
github.com/fluxcd/pkg/ssh v0.7.0
github.com/fluxcd/pkg/version v0.2.0
github.com/go-git/go-billy/v5 v5.3.1
Expand All @@ -38,7 +38,7 @@ require (
github.com/imdario/mergo v0.3.13 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/pjbgf/sha1cd v0.2.1 // indirect
github.com/pjbgf/sha1cd v0.2.3 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/skeema/knownhosts v1.1.0 // indirect
github.com/xanzy/ssh-agent v0.3.2 // indirect
Expand Down
8 changes: 4 additions & 4 deletions git/gogit/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg=
github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo=
github.com/fluxcd/go-git/v5 v5.0.0-20221201130529-11e609450f0f h1:2wrgd/LQ+gkFsKdCsuyliLeco0ewJfzAL8LkLDeo3xM=
github.com/fluxcd/go-git/v5 v5.0.0-20221201130529-11e609450f0f/go.mod h1:0zEnn/bWnWwIA5RUX4vq/JBu0h0H28o1rNQwuEeaYYU=
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df h1:2BHXJp1PwX7D47Q2oaKDekn+BZVZCmxeCWNi+FyownE=
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df/go.mod h1:raWgfUV7lDQVXp4QXUaeNNJkRVKz97UQuF+0kdY7Vmo=
github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
Expand Down Expand Up @@ -63,8 +63,8 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA
github.com/onsi/ginkgo/v2 v2.5.0 h1:TRtrvv2vdQqzkwrQ1ke6vtXf7IK34RBUJafIy1wMwls=
github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E=
github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
github.com/pjbgf/sha1cd v0.2.1 h1:g8hkbV5Cpj24YVSZ4MCAnecIBwsg0bQrvP6xkPUVit4=
github.com/pjbgf/sha1cd v0.2.1/go.mod h1:HOK9QrgzdHpbc2Kzip0Q1yi3M2MFGPADtR6HjG65m5M=
github.com/pjbgf/sha1cd v0.2.3 h1:uKQP/7QOzNtKYH7UTohZLcjF5/55EnTw0jO/Ru4jZwI=
github.com/pjbgf/sha1cd v0.2.3/go.mod h1:HOK9QrgzdHpbc2Kzip0Q1yi3M2MFGPADtR6HjG65m5M=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
2 changes: 1 addition & 1 deletion git/internal/e2e/bitbucket_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func TestBitbucketServerE2E(t *testing.T) {

defer c.Repositories.Delete(context.TODO(), projectKey, repoName)

err = initRepo(upstreamRepoURL, "main", "../../testdata/git/repo", bitbucketServerUsername, bitbucketServerToken)
err = initRepo(t.TempDir(), upstreamRepoURL, "main", "../../testdata/git/repo", bitbucketServerUsername, bitbucketServerToken)
g.Expect(err).ToNot(HaveOccurred())
repoURL, authOptions, err := repoInfo(proto, repo)
g.Expect(err).ToNot(HaveOccurred())
Expand Down
2 changes: 1 addition & 1 deletion git/internal/e2e/github_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func TestGitHubE2E(t *testing.T) {

defer repo.Delete(context.TODO())

err = initRepo(upstreamRepoURL, "main", "../../testdata/git/repo", githubUsername, githubOAuth2Token)
err = initRepo(t.TempDir(), upstreamRepoURL, "main", "../../testdata/git/repo", githubUsername, githubOAuth2Token)
g.Expect(err).ToNot(HaveOccurred())
repoURL, authOptions, err := repoInfo(proto, repo)
g.Expect(err).ToNot(HaveOccurred())
Expand Down
2 changes: 1 addition & 1 deletion git/internal/e2e/gitlab_ce_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func TestGitLabCEE2E(t *testing.T) {
g.Expect(err).ToNot(HaveOccurred())

upstreamRepoURL := gitlabCEHTTPHost + "/" + gitlabCEUsername + "/" + repoName
err = initRepo(upstreamRepoURL, "main", "../../testdata/git/repo", gitlabCEUsername, gitlabCEPassword)
err = initRepo(t.TempDir(), upstreamRepoURL, "main", "../../testdata/git/repo", gitlabCEUsername, gitlabCEPassword)
g.Expect(err).ToNot(HaveOccurred())

client, err := newClient(gitClient, t.TempDir(), authOptions, true)
Expand Down
2 changes: 1 addition & 1 deletion git/internal/e2e/gitlab_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func TestGitLabE2E(t *testing.T) {

defer repo.Delete(context.TODO())

err = initRepo(upstreamRepoURL, "main", "../../testdata/git/repo", gitlabUsername, gitlabPrivateToken)
err = initRepo(t.TempDir(), upstreamRepoURL, "main", "../../testdata/git/repo", gitlabUsername, gitlabPrivateToken)
g.Expect(err).ToNot(HaveOccurred())
repoURL, authOptions, err := repoInfo(proto, repo)
g.Expect(err).ToNot(HaveOccurred())
Expand Down
6 changes: 3 additions & 3 deletions git/internal/e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ replace github.com/libgit2/git2go/v34 => github.com/fluxcd/git2go/v34 v34.0.0

require (
github.com/fluxcd/go-git-providers v0.10.0
github.com/fluxcd/go-git/v5 v5.0.0-20221201130529-11e609450f0f
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df
github.com/fluxcd/pkg/git v0.7.0
github.com/fluxcd/pkg/git/gogit v0.1.0
github.com/fluxcd/pkg/git/libgit2 v0.2.0
github.com/fluxcd/pkg/gittestserver v0.8.0
github.com/fluxcd/pkg/ssh v0.7.0
github.com/go-logr/logr v1.2.3
github.com/google/uuid v1.3.0
github.com/onsi/gomega v1.24.1
)

Expand Down Expand Up @@ -69,7 +70,6 @@ require (
github.com/google/go-github/v47 v47.1.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
Expand All @@ -87,7 +87,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pjbgf/sha1cd v0.2.1 // indirect
github.com/pjbgf/sha1cd v0.2.3 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.13.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions git/internal/e2e/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ github.com/fluxcd/gitkit v0.6.0 h1:iNg5LTx6ePo+Pl0ZwqHTAkhbUHxGVSY3YCxCdw7VIFg=
github.com/fluxcd/gitkit v0.6.0/go.mod h1:svOHuKi0fO9HoawdK4HfHAJJseZDHHjk7I3ihnCIqNo=
github.com/fluxcd/go-git-providers v0.10.0 h1:6zH/HzEFcc9iP2gRTjrog0Ou11MUins8tH7tRZBzhk0=
github.com/fluxcd/go-git-providers v0.10.0/go.mod h1:d/Fu+FtvniNJo6B3HbeEQd4TDTUitsA/zjNOGbEjmDE=
github.com/fluxcd/go-git/v5 v5.0.0-20221201130529-11e609450f0f h1:2wrgd/LQ+gkFsKdCsuyliLeco0ewJfzAL8LkLDeo3xM=
github.com/fluxcd/go-git/v5 v5.0.0-20221201130529-11e609450f0f/go.mod h1:0zEnn/bWnWwIA5RUX4vq/JBu0h0H28o1rNQwuEeaYYU=
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df h1:2BHXJp1PwX7D47Q2oaKDekn+BZVZCmxeCWNi+FyownE=
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df/go.mod h1:raWgfUV7lDQVXp4QXUaeNNJkRVKz97UQuF+0kdY7Vmo=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
Expand Down Expand Up @@ -300,8 +300,8 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo/v2 v2.5.0 h1:TRtrvv2vdQqzkwrQ1ke6vtXf7IK34RBUJafIy1wMwls=
github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E=
github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
github.com/pjbgf/sha1cd v0.2.1 h1:g8hkbV5Cpj24YVSZ4MCAnecIBwsg0bQrvP6xkPUVit4=
github.com/pjbgf/sha1cd v0.2.1/go.mod h1:HOK9QrgzdHpbc2Kzip0Q1yi3M2MFGPADtR6HjG65m5M=
github.com/pjbgf/sha1cd v0.2.3 h1:uKQP/7QOzNtKYH7UTohZLcjF5/55EnTw0jO/Ru4jZwI=
github.com/pjbgf/sha1cd v0.2.3/go.mod h1:HOK9QrgzdHpbc2Kzip0Q1yi3M2MFGPADtR6HjG65m5M=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Expand Down
37 changes: 19 additions & 18 deletions git/internal/e2e/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"github.com/fluxcd/go-git/v5/plumbing/object"
"github.com/fluxcd/go-git/v5/plumbing/transport"
"github.com/fluxcd/go-git/v5/plumbing/transport/http"
"github.com/google/uuid"
. "github.com/onsi/gomega"

"github.com/fluxcd/pkg/git"
Expand All @@ -56,10 +57,10 @@ func testUsingClone(g *WithT, client repository.Client, repoURL *url.URL, upstre
cc, err := client.Commit(
mockCommitInfo(),
repository.WithFiles(map[string]io.Reader{
"test": strings.NewReader(randStringRunes(10)),
"test1": strings.NewReader(uuid.New().String()),
}),
)
g.Expect(err).ToNot(HaveOccurred())
g.Expect(err).ToNot(HaveOccurred(), "first commit")

err = client.Push(context.TODO())
g.Expect(err).ToNot(HaveOccurred())
Expand All @@ -76,10 +77,10 @@ func testUsingClone(g *WithT, client repository.Client, repoURL *url.URL, upstre
cc, err = client.Commit(
mockCommitInfo(),
repository.WithFiles(map[string]io.Reader{
"test": strings.NewReader(randStringRunes(10)),
"test2": strings.NewReader(uuid.New().String()),
}),
)
g.Expect(err).ToNot(HaveOccurred())
g.Expect(err).ToNot(HaveOccurred(), "second commit")

err = client.Push(context.TODO())
g.Expect(err).ToNot(HaveOccurred())
Expand All @@ -95,10 +96,10 @@ func testUsingClone(g *WithT, client repository.Client, repoURL *url.URL, upstre
_, err = client.Commit(
mockCommitInfo(),
repository.WithFiles(map[string]io.Reader{
"test": strings.NewReader(randStringRunes(10)),
"test3": strings.NewReader(uuid.New().String()),
}),
)
g.Expect(err).ToNot(HaveOccurred())
g.Expect(err).ToNot(HaveOccurred(), "third commit")
err = client.Push(context.TODO())
g.Expect(err).ToNot(HaveOccurred())
headCommit, _, err = headCommitWithBranch(upstreamRepo.url, "new", upstreamRepo.username, upstreamRepo.password)
Expand All @@ -114,10 +115,10 @@ func testUsingInit(g *WithT, client repository.Client, repoURL *url.URL, upstrea
cc, err := client.Commit(
mockCommitInfo(),
repository.WithFiles(map[string]io.Reader{
"test": strings.NewReader(randStringRunes(10)),
"test1": strings.NewReader(uuid.New().String()),
}),
)
g.Expect(err).ToNot(HaveOccurred())
g.Expect(err).ToNot(HaveOccurred(), "first commit")

err = client.Push(context.TODO())
g.Expect(err).ToNot(HaveOccurred())
Expand All @@ -132,10 +133,10 @@ func testUsingInit(g *WithT, client repository.Client, repoURL *url.URL, upstrea
cc, err = client.Commit(
mockCommitInfo(),
repository.WithFiles(map[string]io.Reader{
"test": strings.NewReader(randStringRunes(10)),
"test2": strings.NewReader(uuid.New().String()),
}),
)
g.Expect(err).ToNot(HaveOccurred())
g.Expect(err).ToNot(HaveOccurred(), "second commit")

err = client.Push(context.TODO())
g.Expect(err).ToNot(HaveOccurred())
Expand All @@ -150,10 +151,10 @@ func testUsingInit(g *WithT, client repository.Client, repoURL *url.URL, upstrea
_, err = client.Commit(
mockCommitInfo(),
repository.WithFiles(map[string]io.Reader{
"test": strings.NewReader(randStringRunes(10)),
"test3": strings.NewReader(uuid.New().String()),
}),
)
g.Expect(err).ToNot(HaveOccurred())
g.Expect(err).ToNot(HaveOccurred(), "third commit")
err = client.Push(context.TODO())
g.Expect(err).ToNot(HaveOccurred())
headCommit, _, err = headCommitWithBranch(upstreamRepo.url, "new", upstreamRepo.username, upstreamRepo.password)
Expand Down Expand Up @@ -234,12 +235,7 @@ type upstreamRepoInfo struct {
password string
}

func initRepo(repoURL, branch, fixture, username, password string) error {
tmp, err := os.MkdirTemp("", "git-e2e-test")
if err != nil {
return err
}

func initRepo(tmp, repoURL, branch, fixture, username, password string) error {
repo, err := extgogit.PlainInit(tmp, false)
if err != nil {
return err
Expand Down Expand Up @@ -287,6 +283,11 @@ func initRepo(repoURL, branch, fixture, username, password string) error {
return err
}

_, err = wt.Add(".")
if err != nil {
return err
}

pjbgf marked this conversation as resolved.
Show resolved Hide resolved
info := mockCommitInfo()
_, err = wt.Commit(info.Message, &extgogit.CommitOptions{
Author: &object.Signature{
Expand Down
19 changes: 16 additions & 3 deletions git/libgit2/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ import (
"io"
"net/url"
"os"
"runtime"
"strings"
"time"

"github.com/ProtonMail/go-crypto/openpgp"
"github.com/ProtonMail/go-crypto/openpgp/packet"
"github.com/fluxcd/pkg/git/gogit/fs"
"github.com/go-git/go-billy/v5"
"github.com/go-git/go-billy/v5/memfs"
"github.com/go-git/go-billy/v5/osfs"
"github.com/go-git/go-billy/v5/util"
git2go "github.com/libgit2/git2go/v34"

Expand Down Expand Up @@ -97,7 +98,7 @@ func NewClient(path string, authOpts *git.AuthOptions, clientOpts ...ClientOptio

func WithDiskStorage() ClientOption {
return func(c *Client) error {
c.repoFS = osfs.New(c.path)
c.repoFS = fs.New(c.path)
return nil
}
}
Expand Down Expand Up @@ -313,9 +314,21 @@ func (l *Client) Commit(info git.Commit, commitOpts ...repository.CommitOption)
}
defer index.Free()

if err = util.Walk(l.repoFS, "",
walkPath := ""
// Workaround bug in MacOS.
if runtime.GOOS == "darwin" {
walkPath = l.path
}

if err = util.Walk(l.repoFS, walkPath,
func(path string, info os.FileInfo, err error) error {
if err != nil {
// Workaround bug in MacOS. This code is being sunsetting
// soon as part of libgit2 decommissioning, therefore no
// need for a more robust fix.
if strings.Contains(err.Error(), "path outside working dir") && path == l.path {
return nil
}
return err
}
// skip symlinks and any files that are within ".git/"
Expand Down
12 changes: 10 additions & 2 deletions git/libgit2/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,16 @@ func Test_writeFile(t *testing.T) {
g.Expect(err).ToNot(HaveOccurred())
g.Expect(string(cont)).To(Equal(fileStr))

err = lgc.writeFile("../tmp/test3", strings.NewReader("path outside repo"))
g.Expect(err).To(HaveOccurred())
relPathContent := "rel path outside repo"
err = lgc.writeFile("../tmp/test3", strings.NewReader(relPathContent))
g.Expect(err).ToNot(HaveOccurred())

relExpectedPath := filepath.Join(tmp, "tmp", "test3")
defer os.RemoveAll(relExpectedPath)

cont, err = os.ReadFile(relExpectedPath)
g.Expect(err).ToNot(HaveOccurred())
g.Expect(string(cont)).To(Equal(relPathContent))
}

func TestCommit(t *testing.T) {
Expand Down
6 changes: 4 additions & 2 deletions git/libgit2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ require (
github.com/Masterminds/semver/v3 v3.1.1
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
github.com/elazarl/goproxy v0.0.0-20220529153421-8ea89ba92021
github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819
github.com/fluxcd/gitkit v0.6.0
github.com/fluxcd/pkg/git v0.7.0
github.com/fluxcd/pkg/git/gogit v0.0.0-00010101000000-000000000000
github.com/fluxcd/pkg/gittestserver v0.8.0
github.com/fluxcd/pkg/http/transport v0.1.0
github.com/fluxcd/pkg/ssh v0.7.0
Expand Down Expand Up @@ -62,7 +63,7 @@ require (
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fluxcd/go-git/v5 v5.0.0-20221104190732-329fd6659b10 // indirect
github.com/fluxcd/go-git/v5 v5.0.0-20221206140629-ec778c2c37df // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
Expand All @@ -86,6 +87,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pjbgf/sha1cd v0.2.3 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.13.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
Expand Down