Merge pull request #16283 from Bo98/update-master-fix

cmd/update.sh: don't switch to master when updating to a tag
This commit is contained in:
Bo Anderson 2023-12-04 02:25:02 +00:00 committed by GitHub
commit 8fbe92754a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -268,7 +268,7 @@ EOS
else
if [[ -n "${UPSTREAM_TAG}" && "${UPSTREAM_BRANCH}" != "master" ]]
then
git checkout --force -B "master" "origin/master" "${QUIET_ARGS[@]}"
git branch --force "master" "origin/master" "${QUIET_ARGS[@]}"
fi
git checkout --force -B "${UPSTREAM_BRANCH}" "${REMOTE_REF}" "${QUIET_ARGS[@]}"