[supervisor] Configure new safe.directory setting

Author: aledbf

components/content-service/pkg/git/git.go

@@ -169,6 +169,14 @@ func (c *Client) GitWithOutput(ctx context.Context, subcommand string, args ...s
 		env = append(env, fmt.Sprintf("GIT_AUTH_PASSWORD=%s", pwd))
 	}
 
+	homeDir, err := os.MkdirTemp("", "git")
+	if err != nil {
+		return nil, xerrors.Errorf("cannot create temporal directory")
+	}
+	defer os.RemoveAll(homeDir)
+
+	env = append(env, fmt.Sprintf("HOME=%v", homeDir))
+
 	fullArgs = append(fullArgs, subcommand)
 	fullArgs = append(fullArgs, args...)
 

components/ws-daemon/pkg/internal/session/workspace.go

@@ -273,6 +273,13 @@ func (s *Workspace) UpdateGitStatus(ctx context.Context) (res *csapi.GitStatus,
 	}
 
 	c := git.Client{Location: loc}
+
+	err = c.Git(ctx, "config", "--global", "--add", "safe.directory", loc)
+	if err != nil {
+		log.WithError(err).WithFields(s.OWI()).Warn("cannot persist latest Git status")
+		err = nil
+	}
+
 	stat, err := c.Status(ctx)
 	if err != nil {
 		return nil, err