Ignore broken symlink check when committing deleted files

Signed-off-by: Philip Laine <philip.laine@gmail.com>

cmd/flux/bootstrap_bitbucket_server.go

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

cmd/flux/bootstrap_git.go

@@ -24,7 +24,6 @@ import (
 	"strings"
 	"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/http"
 	"github.com/go-git/go-git/v5/plumbing/transport/ssh"

cmd/flux/bootstrap_github.go

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

cmd/flux/bootstrap_gitlab.go

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

pkg/bootstrap/git/gogit/gogit.go

@@ -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
 	// change to a broken symlink: so, detect and skip those.
 	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)
 		info, err := os.Lstat(abspath)
 		if err != nil {