actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-22 15:41:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Ignore broken symlink check when committing deleted files

Browse source 
Signed-off-by: Philip Laine <philip.laine@gmail.com>
This commit is contained in:
Philip Laine 2022-11-01 13:54:21 +01:00
parent 22a8aa57ae
commit be9f5ecade
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/flux/bootstrap_bitbucket_server.go
View file

@ -22,7 +22,6 @@ import (
"os" "os"
"time" "time"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/go-git/go-git/v5/plumbing/transport/http" "github.com/go-git/go-git/v5/plumbing/transport/http"
"github.com/spf13/cobra" "github.com/spf13/cobra"

1
cmd/flux/bootstrap_git.go
View file

@ -24,7 +24,6 @@ import (
"strings" "strings"
"time" "time"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/go-git/go-git/v5/plumbing/transport" "github.com/go-git/go-git/v5/plumbing/transport"
"github.com/go-git/go-git/v5/plumbing/transport/http" "github.com/go-git/go-git/v5/plumbing/transport/http"
"github.com/go-git/go-git/v5/plumbing/transport/ssh" "github.com/go-git/go-git/v5/plumbing/transport/ssh"

1
cmd/flux/bootstrap_github.go
View file

@ -22,7 +22,6 @@ import (
"os" "os"
"time" "time"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/go-git/go-git/v5/plumbing/transport/http" "github.com/go-git/go-git/v5/plumbing/transport/http"
"github.com/spf13/cobra" "github.com/spf13/cobra"

1
cmd/flux/bootstrap_gitlab.go
View file

@ -24,7 +24,6 @@ import (
"strings" "strings"
"time" "time"
"github.com/ProtonMail/go-crypto/openpgp"
"github.com/go-git/go-git/v5/plumbing/transport/http" "github.com/go-git/go-git/v5/plumbing/transport/http"
"github.com/spf13/cobra" "github.com/spf13/cobra"

8
pkg/bootstrap/git/gogit/gogit.go
View file

@ -160,7 +160,13 @@ func (g *GoGit) Commit(message git.Commit, opts ...git.Option) (string, error) {
// modified. There's no circumstance in which we want to commit a // modified. There's no circumstance in which we want to commit a
// change to a broken symlink: so, detect and skip those. // change to a broken symlink: so, detect and skip those.
var changed bool var changed bool
for file, _ := range status { for file, fileStatus := range status {
if fileStatus.Worktree == gogit.Deleted {
_, _ = wt.Add(file)
changed = true
continue
}
abspath := filepath.Join(g.path, file) abspath := filepath.Join(g.path, file)
info, err := os.Lstat(abspath) info, err := os.Lstat(abspath)
if err != nil { if err != nil {