Skip to content

Commit f124c33

Browse files
Fix incorrect error message when creating the merge branch during alpha update.
1 parent 4448e20 commit f124c33

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

pkg/cli/alpha/internal/update/update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ func (opts *Update) prepareUpgradeBranch() error {
321321
// mergeOriginalToUpgrade attempts to merge the upgrade branch
322322
func (opts *Update) mergeOriginalToUpgrade() error {
323323
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)
325325
}
326326

327327
checkoutCmd := exec.Command("git", "checkout", opts.MergeBranch)

0 commit comments

Comments
 (0)