Merge pull request #4993 from camilamacedo86/fix-error-msg

k8s-ci-robot · web-flow · commit 0e594cca1fbc · 2025-08-07T04:47:47.000-07:00
🐛 (alpha commands): Fix incorrect error message when creating the merge branch during alpha update.
diff --git a/pkg/cli/alpha/internal/update/update.go b/pkg/cli/alpha/internal/update/update.go
@@ -321,7 +321,7 @@ func (opts *Update) prepareUpgradeBranch() error {
 // mergeOriginalToUpgrade attempts to merge the upgrade branch
 func (opts *Update) mergeOriginalToUpgrade() error {
 	if err := exec.Command("git", "checkout", "-b", opts.MergeBranch, opts.UpgradeBranch).Run(); err != nil {
-		return fmt.Errorf("failed to create merge branch %s from %s: %w", opts.MergeBranch, opts.OriginalBranch, err)
+		return fmt.Errorf("failed to create merge branch %s from %s: %w", opts.MergeBranch, opts.UpgradeBranch, err)
 	}
 
 	checkoutCmd := exec.Command("git", "checkout", opts.MergeBranch)

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ func (opts *Update) prepareUpgradeBranch() error {`
`321`	`321`	`// mergeOriginalToUpgrade attempts to merge the upgrade branch`
`322`	`322`	`func (opts *Update) mergeOriginalToUpgrade() error {`
`323`	`323`	`if err := exec.Command("git", "checkout", "-b", opts.MergeBranch, opts.UpgradeBranch).Run(); err != nil {`
`324`		`- return fmt.Errorf("failed to create merge branch %s from %s: %w", opts.MergeBranch, opts.OriginalBranch, err)`
	`324`	`+ return fmt.Errorf("failed to create merge branch %s from %s: %w", opts.MergeBranch, opts.UpgradeBranch, err)`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`checkoutCmd := exec.Command("git", "checkout", opts.MergeBranch)`