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

Merge pull request #13187 from maxim-belkin/creating-new-tap

Browse Source 
update/update-reset: warn when no origin remote
This commit is contained in:
Mike McQuaid 2022-04-26 17:04:51 +01:00 committed by GitHub
commit b6e8097cf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/cmd/update-reset.sh
View File

@ -17,6 +17,7 @@ git() {
} }
homebrew-update-reset() { homebrew-update-reset() {
local option
local DIR local DIR
local -a REPOS=() local -a REPOS=()
@ -50,6 +51,11 @@ homebrew-update-reset() {
for DIR in "${REPOS[@]}" for DIR in "${REPOS[@]}"
do do
[[ -d "${DIR}/.git" ]] || continue [[ -d "${DIR}/.git" ]] || continue
if ! git -C "${DIR}" config --local --get remote.origin.url &>/dev/null
then
opoo "No remote 'origin' in ${DIR}, skipping update and reset!"
continue
fi
ohai "Fetching ${DIR}..." ohai "Fetching ${DIR}..."
git -C "${DIR}" fetch --force --tags origin git -C "${DIR}" fetch --force --tags origin
git -C "${DIR}" remote set-head origin --auto >/dev/null git -C "${DIR}" remote set-head origin --auto >/dev/null

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

@ -555,6 +555,12 @@ EOS
[[ -d "${DIR}/.git" ]] || continue [[ -d "${DIR}/.git" ]] || continue
cd "${DIR}" || continue cd "${DIR}" || continue
if ! git config --local --get remote.origin.url &>/dev/null
then
opoo "No remote 'origin' in ${DIR}, skipping update!"
continue
fi
if [[ -n "${HOMEBREW_VERBOSE}" ]] if [[ -n "${HOMEBREW_VERBOSE}" ]]
then then
echo "Checking if we need to fetch ${DIR}..." echo "Checking if we need to fetch ${DIR}..."
@ -706,6 +712,11 @@ EOS
[[ -d "${DIR}/.git" ]] || continue [[ -d "${DIR}/.git" ]] || continue
cd "${DIR}" || continue cd "${DIR}" || continue
if ! git config --local --get remote.origin.url &>/dev/null
then
# No need to display a (duplicate) warning here
continue
fi
TAP_VAR="$(repo_var "${DIR}")" TAP_VAR="$(repo_var "${DIR}")"
UPSTREAM_BRANCH_VAR="UPSTREAM_BRANCH${TAP_VAR}" UPSTREAM_BRANCH_VAR="UPSTREAM_BRANCH${TAP_VAR}"