mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20186 from Homebrew/origin-head-fix

Browse Source 
cmd/update: ensure we update remote main ref
This commit is contained in:
Bo Anderson 2025-06-27 16:57:41 +00:00 committed by GitHub
commit 4dabf8da16
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,6 +252,7 @@ EOS
fi fi
INITIAL_BRANCH="$(git symbolic-ref --short HEAD 2>/dev/null)" INITIAL_BRANCH="$(git symbolic-ref --short HEAD 2>/dev/null)"
SOFT_DELETE_MASTER=
if [[ "${INITIAL_BRANCH}" == "master" && if [[ "${INITIAL_BRANCH}" == "master" &&
("${DIR}" == "${HOMEBREW_REPOSITORY}" || "${DIR}" == "${HOMEBREW_CORE_REPOSITORY}" || "${DIR}" == "${HOMEBREW_CASK_REPOSITORY}") ]] ("${DIR}" == "${HOMEBREW_REPOSITORY}" || "${DIR}" == "${HOMEBREW_CORE_REPOSITORY}" || "${DIR}" == "${HOMEBREW_CASK_REPOSITORY}") ]]
then then
@ -682,6 +683,16 @@ EOS
UPSTREAM_REPOSITORY_TOKEN="${BASH_REMATCH[1]#*:}" UPSTREAM_REPOSITORY_TOKEN="${BASH_REMATCH[1]#*:}"
fi fi
MAIN_MIGRATION_REQUIRED=
if [[ "${UPSTREAM_BRANCH_DIR}" == "master" &&
("${DIR}" == "${HOMEBREW_REPOSITORY}" || "${DIR}" == "${HOMEBREW_CORE_REPOSITORY}" || "${DIR}" == "${HOMEBREW_CASK_REPOSITORY}") ]]
then
# Migrate master to main for Homebrew/brew, homebrew-core or homebrew-cask
MAIN_MIGRATION_REQUIRED=1
UPSTREAM_BRANCH_DIR="main"
declare UPSTREAM_BRANCH"${TAP_VAR}"="main"
fi
if [[ -n "${UPSTREAM_REPOSITORY}" ]] if [[ -n "${UPSTREAM_REPOSITORY}" ]]
then then
# UPSTREAM_REPOSITORY_TOKEN is parsed (if exists) from UPSTREAM_REPOSITORY_URL # UPSTREAM_REPOSITORY_TOKEN is parsed (if exists) from UPSTREAM_REPOSITORY_URL
@ -793,6 +804,11 @@ EOS
fi fi
fi fi
if [[ -n "${MAIN_MIGRATION_REQUIRED}" ]]
then
git remote set-head origin --auto >/dev/null
fi
rm -f "${tmp_failure_file}" rm -f "${tmp_failure_file}"
) & ) &
done done