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

cmd/update: attempt migration from master to main branch.

Browse Source 
This should allow any repositories that change from `master` to `main`
to be automatically migrated by `brew update` without requiring manual
intervention or displaying errors to the user.
This commit is contained in:
Mike McQuaid 2025-06-11 08:38:32 +01:00
parent 144113318e
commit 837b28ba79
No known key found for this signature in database
1 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -725,31 +725,53 @@ EOS
local tmp_failure_file="${DIR}/.git/TMP_FETCH_FAILURES" local tmp_failure_file="${DIR}/.git/TMP_FETCH_FAILURES"
rm -f "${tmp_failure_file}" rm -f "${tmp_failure_file}"
if [[ -n "${HOMEBREW_UPDATE_AUTO}" ]] if ! git fetch --tags --force "${QUIET_ARGS[@]}" origin \
"refs/heads/${UPSTREAM_BRANCH_DIR}:refs/remotes/origin/${UPSTREAM_BRANCH_DIR}" 2>>"${tmp_failure_file}"
then then
git fetch --tags --force "${QUIET_ARGS[@]}" origin \ if [[ -f "${tmp_failure_file}" ]]
"refs/heads/${UPSTREAM_BRANCH_DIR}:refs/remotes/origin/${UPSTREAM_BRANCH_DIR}" 2>/dev/null
else
# Capture stderr to tmp_failure_file
if ! git fetch --tags --force "${QUIET_ARGS[@]}" origin \
"refs/heads/${UPSTREAM_BRANCH_DIR}:refs/remotes/origin/${UPSTREAM_BRANCH_DIR}" 2>>"${tmp_failure_file}"
then then
# Reprint fetch errors to stderr local git_errors
[[ -f "${tmp_failure_file}" ]] && cat "${tmp_failure_file}" 1>&2 git_errors="$(cat "${tmp_failure_file}")"
if [[ "${git_errors}" == "fatal: couldn't find remote ref refs/heads/master" ]]
if [[ "${UPSTREAM_SHA_HTTP_CODE}" == "404" ]]
then then
TAP="${DIR#"${HOMEBREW_LIBRARY}"/Taps/}" # Attempt migration from master to main branch.
echo "${TAP} does not exist! Run \`brew untap ${TAP}\` to remove it." >>"${update_failed_file}" if git fetch --tags --force "${QUIET_ARGS[@]}" origin \
else "refs/heads/main:refs/remotes/origin/main" 2>>"${tmp_failure_file}"
echo "Fetching ${DIR} failed!" >>"${update_failed_file}"
if [[ -f "${tmp_failure_file}" ]] &&
[[ "$(cat "${tmp_failure_file}")" == "fatal: couldn't find remote ref refs/heads/${UPSTREAM_BRANCH_DIR}" ]]
then then
echo "${DIR}" >>"${missing_remote_ref_dirs_file}" rm -f "${DIR}/.git/refs/remotes/origin/HEAD" "${DIR}/.git/refs/remotes/origin/master"
UPSTREAM_BRANCH_DIR="$(upstream_branch)"
declare UPSTREAM_BRANCH"${TAP_VAR}"="${UPSTREAM_BRANCH_DIR}"
git branch -m master main "${QUIET_ARGS[@]}"
git branch -u origin/main main "${QUIET_ARGS[@]}"
rm -f "${tmp_failure_file}"
exit
fi fi
fi fi
rm -f "${tmp_failure_file}"
fi
# Don't output errors if HOMEBREW_UPDATE_AUTO is set.
if [[ -n "${HOMEBREW_UPDATE_AUTO}" ]]
then
exit
fi
# Reprint fetch errors to stderr
[[ -n "${git_errors}" ]] && echo "${git_errors}" 1>&2
if [[ "${UPSTREAM_SHA_HTTP_CODE}" == "404" ]]
then
TAP="${DIR#"${HOMEBREW_LIBRARY}"/Taps/}"
echo "${TAP} does not exist! Run \`brew untap ${TAP}\` to remove it." >>"${update_failed_file}"
else
echo "Fetching ${DIR} failed!" >>"${update_failed_file}"
if [[ -f "${tmp_failure_file}" ]] &&
[[ "$(cat "${tmp_failure_file}")" == "fatal: couldn't find remote ref refs/heads/${UPSTREAM_BRANCH_DIR}" ]]
then
echo "${DIR}" >>"${missing_remote_ref_dirs_file}"
fi
fi fi
fi fi