Merge pull request #5029 from Deofex/fix-e2e-initalize-git-repo

k8s-ci-robot · web-flow · commit 6e00113692e5 · 2025-08-21T05:21:06.000-07:00
🐛 Fix git branch creation error when `main` already exists
diff --git a/test/e2e/alphaupdate/update_test.go b/test/e2e/alphaupdate/update_test.go
@@ -399,7 +399,7 @@ func initializeGitRepo(projectDir string) {
 		{"git", "config", "user.name", "Test User"},
 		{"git", "add", "-A"},
 		{"git", "commit", "-m", "Initial project with custom code"},
-		{"git", "checkout", "-b", "main"},
+		{"git", "branch", "-M", "main"},
 	}
 	for _, args := range commands {
 		cmd := exec.Command(args[0], args[1:]...)

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ func initializeGitRepo(projectDir string) {`
`399`	`399`	`{"git", "config", "user.name", "Test User"},`
`400`	`400`	`{"git", "add", "-A"},`
`401`	`401`	`{"git", "commit", "-m", "Initial project with custom code"},`
`402`		`- {"git", "checkout", "-b", "main"},`
	`402`	`+ {"git", "branch", "-M", "main"},`
`403`	`403`	`}`
`404`	`404`	`for _, args := range commands {`
`405`	`405`	`cmd := exec.Command(args[0], args[1:]...)`