mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-01-03 11:45:20 +00:00
704bf01fab
The command to check for an existing release branch only checked for local branches. We should be considering both local and remote branches before cherry-picking commits for the new release. This change checks for existing local and remote release branches and creates or updates them accordingly. * If a remote branch exists, but a local branch does not, checkout the remote branch and track it. * If the remote branch and local branch exists, checkout the local branch and ensure that the latest commits from the remote are pulled. * Otherwise, if the remote branch does not exist, create it locally if needed. This also handles the case where an existing release branch may be tracked in multiple remotes as the remote to use is explicitly stated. Signed-off-by: Bridget McErlean <bmcerlean@vmware.com>