[content-init] When checking out a new local branch (issue context), base it on origin/HEAD

jankeromnes · jankeromnes · commit 0c354b6f6f0a · 2021-05-14T16:39:26.000Z
We previously assumed that a prebuild snapshot holds the latest commits, but this changes with incremental prebuilds (where an older prebuild doesn't have the latest commits). Fixes #4167 (comment)
diff --git a/components/content-service/pkg/initializer/git.go b/components/content-service/pkg/initializer/git.go
@@ -98,7 +98,7 @@ func (ws *GitInitializer) realizeCloneTarget(ctx context.Context) (err error) {
 			return err
 		}
 	} else if ws.TargetMode == LocalBranch {
-		if err := ws.Git(ctx, "checkout", "-b", ws.CloneTarget); err != nil {
+		if err := ws.Git(ctx, "checkout", "-B", ws.CloneTarget, "origin/HEAD"); err != nil {
 			return err
 		}
 	} else if ws.TargetMode == RemoteCommit {

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func (ws *GitInitializer) realizeCloneTarget(ctx context.Context) (err error) {`
`98`	`98`	`return err`
`99`	`99`	`}`
`100`	`100`	`} else if ws.TargetMode == LocalBranch {`
`101`		`- if err := ws.Git(ctx, "checkout", "-b", ws.CloneTarget); err != nil {`
	`101`	`+ if err := ws.Git(ctx, "checkout", "-B", ws.CloneTarget, "origin/HEAD"); err != nil {`
`102`	`102`	`return err`
`103`	`103`	`}`
`104`	`104`	`} else if ws.TargetMode == RemoteCommit {`