1

Author: aledbf

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

@@ -195,6 +195,8 @@ func (c *Client) GitWithOutput(ctx context.Context, ignoreErr *string, subcomman
 		env = append(env, fmt.Sprintf("GIT_SSL_CAINFO=%s", v))
 	}
 
+	span.LogKV("args", fullArgs)
+
 	cmd := exec.Command("git", fullArgs...)
 	cmd.Dir = c.Location
 	cmd.Env = env

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

@@ -93,6 +93,11 @@ func (ws *GitInitializer) Run(ctx context.Context, mappings []archive.IDMapping)
 			log.WithError(err).WithField("location", ws.Location).Error("cannot configure fecth behavior")
 		}
 
+		err = ws.Git(ctx, "config", "--replace-all", "checkout.defaultRemote", "origin")
+		if err != nil {
+			log.WithError(err).WithField("location", ws.Location).Error("cannot configure checkout defaultRemote")
+		}
+
 		return nil
 	}
 	onGitCloneFailure := func(e error, d time.Duration) {
@@ -176,7 +181,12 @@ func (ws *GitInitializer) realizeCloneTarget(ctx context.Context) (err error) {
 			return err
 		}
 
-		if err := ws.Git(ctx, "switch", "--track", "-C", ws.CloneTarget); err != nil {
+		if err := ws.Git(ctx, "fetch", "origin", ws.CloneTarget); err != nil {
+			log.WithError(err).WithField("remoteURI", ws.RemoteURI).WithField("branch", ws.CloneTarget).Error("Cannot fetch remote branch")
+			return err
+		}
+
+		if err := ws.Git(ctx, "checkout", "-B", ws.CloneTarget, "--track"); err != nil {
 			log.WithError(err).WithField("remoteURI", ws.RemoteURI).WithField("branch", ws.CloneTarget).Error("Cannot fetch remote branch")
 			return err
 		}
@@ -194,7 +204,7 @@ func (ws *GitInitializer) realizeCloneTarget(ctx context.Context) (err error) {
 		}
 
 		// checkout specific commit
-		if err := ws.Git(ctx, "switch", "--track", "-C", ws.CloneTarget); err != nil {
+		if err := ws.Git(ctx, "checkout", "-B", ws.CloneTarget, "--track"); err != nil {
 			return err
 		}
 	default: