[ws-daemon] Properly handle git status for FWB workspaces

Author: csweichel

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

@@ -248,8 +248,23 @@ func (s *Workspace) SetGitStatus(status *csapi.GitStatus) error {
 
 // UpdateGitStatus attempts to update the LastGitStatus from the workspace's local working copy.
 func (s *Workspace) UpdateGitStatus(ctx context.Context) (res *csapi.GitStatus, err error) {
-	loc := filepath.Join(s.Location, s.CheckoutLocation)
+	loc := s.Location
+	if loc == "" {
+		// FWB workspaces don't have `Location` set, but rather ServiceLocDaemon and ServiceLocNode.
+		// We'd can't easily produce the Git status, because in this context `mark` isn't mounted, and `upper`
+		// only contains the full git working copy if the content was just initialised.
+		// Something like
+		//   loc = filepath.Join(s.ServiceLocDaemon, "mark", "workspace")
+		// does not work.
+		//
+		// TODO(cw): figure out a way to get ahold of the Git status.
+		log.WithField("loc", loc).WithFields(s.OWI()).Debug("not updating Git status of FWB workspace")
+		return
+	}
+
+	loc = filepath.Join(loc, s.CheckoutLocation)
 	if !git.IsWorkingCopy(loc) {
+		log.WithField("loc", loc).WithFields(s.OWI()).Debug("did not find a Git working copy - not updating Git status")
 		return nil, nil
 	}