admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

cmd/update.sh: check initial branch is not master

Browse Source 
Check that the initial branch is not 'master' before doing a forced update on 'master'. Git will fail with fatal error otherwise.
This commit is contained in:
Darren Kavanagh 2024-05-08 13:53:10 -07:00
parent 21e130056a
commit 85cd2f075e
No known key found for this signature in database
GPG Key ID: A258D1E837E3C689
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cmd/update.sh
View File

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