From 27a2dba3407ecd27b3f8c6444285eebe0b8fa43d Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Mon, 25 Apr 2022 04:22:12 -0700 Subject: [PATCH] update/update-reset: warn when no origin remote Current situation with update.sh & update-reset.sh: Upon creating a new tap and before adding remote 'origin' to it, running `brew update` produces multiple cryptic error messages. This change converts these cryptic Git messages into clear warnings about absent remote 'origin'. How to test: 1. Create a new tap using `brew tap-new` 2. Run `brew update` --- Library/Homebrew/cmd/update-reset.sh | 6 ++++++ Library/Homebrew/cmd/update.sh | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/Library/Homebrew/cmd/update-reset.sh b/Library/Homebrew/cmd/update-reset.sh index 75a9062838..a54656058c 100644 --- a/Library/Homebrew/cmd/update-reset.sh +++ b/Library/Homebrew/cmd/update-reset.sh @@ -17,6 +17,7 @@ git() { } homebrew-update-reset() { + local option local DIR local -a REPOS=() @@ -50,6 +51,11 @@ homebrew-update-reset() { for DIR in "${REPOS[@]}" do [[ -d "${DIR}/.git" ]] || continue + if ! git -C "${DIR}" config --local --get remote.origin.url &>/dev/null + then + opoo "No remote 'origin' in: ${DIR}" + continue + fi ohai "Fetching ${DIR}..." git -C "${DIR}" fetch --force --tags origin git -C "${DIR}" remote set-head origin --auto >/dev/null diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index 6e6693c829..1ec6067f00 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -555,6 +555,11 @@ EOS [[ -d "${DIR}/.git" ]] || continue cd "${DIR}" || continue + if ! git config --local --get remote.origin.url &>/dev/null + then + opoo "No remote 'origin' in: ${DIR}" + continue + fi if [[ -n "${HOMEBREW_VERBOSE}" ]] then echo "Checking if we need to fetch ${DIR}..." @@ -706,6 +711,11 @@ EOS [[ -d "${DIR}/.git" ]] || 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}")" UPSTREAM_BRANCH_VAR="UPSTREAM_BRANCH${TAP_VAR}"