1

Author: aledbf

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

@@ -186,7 +186,7 @@ func (ws *GitInitializer) realizeCloneTarget(ctx context.Context) (err error) {
 			return err
 		}
 
-		if err := ws.Git(ctx, "checkout", "--track", "origin/"+ws.CloneTarget); err != nil {
+		if err := ws.Git(ctx, "checkout", "--track", "-B", ws.CloneTarget, "origin/"+ws.CloneTarget); err != nil {
 			log.WithError(err).WithField("remoteURI", ws.RemoteURI).WithField("branch", ws.CloneTarget).Error("Cannot fetch remote branch")
 			return err
 		}
@@ -204,7 +204,7 @@ func (ws *GitInitializer) realizeCloneTarget(ctx context.Context) (err error) {
 		}
 
 		// checkout specific commit
-		if err := ws.Git(ctx, "checkout", "--track", "origin/"+ws.CloneTarget); err != nil {
+		if err := ws.Git(ctx, "checkout", "--track", "-B", ws.CloneTarget, "origin/"+ws.CloneTarget); err != nil {
 			return err
 		}
 	default: