[content-service] Fix checkout local HEAD branch

aledbf · roboquat · commit 57fdeaa31726 · 2022-09-27T04:23:27.000+02:00
diff --git a/components/content-service/pkg/initializer/git.go b/components/content-service/pkg/initializer/git.go
@@ -192,7 +192,7 @@ func (ws *GitInitializer) realizeCloneTarget(ctx context.Context) (err error) {
 		}
 	case LocalBranch:
 		// checkout local branch based on remote HEAD
-		if err := ws.Git(ctx, "checkout", "origin/HEAD", "--no-track"); err != nil {
+		if err := ws.Git(ctx, "checkout", "-B", ws.CloneTarget, "origin/HEAD", "--no-track"); err != nil {
 			return err
 		}
 	case RemoteCommit:

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ func (ws *GitInitializer) realizeCloneTarget(ctx context.Context) (err error) {`
`192`	`192`	`}`
`193`	`193`	`case LocalBranch:`
`194`	`194`	`// checkout local branch based on remote HEAD`
`195`		`- if err := ws.Git(ctx, "checkout", "origin/HEAD", "--no-track"); err != nil {`
	`195`	`+ if err := ws.Git(ctx, "checkout", "-B", ws.CloneTarget, "origin/HEAD", "--no-track"); err != nil {`
`196`	`196`	`return err`
`197`	`197`	`}`
`198`	`198`	`case RemoteCommit:`