From 7c4b1841bca92c989cd5b0d6bea5c832494ba404 Mon Sep 17 00:00:00 2001
From: Maxim Belkin <maxim.belkin@gmail.com>
Date: Fri, 20 Nov 2020 18:02:22 -0600
Subject: [PATCH] Use set -e/set +e instead of odie

---
 Library/Homebrew/cmd/update.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index d1ebdec412..b39e3840cf 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -368,30 +368,27 @@ user account:
 EOS
   fi
 
-  # we may want to use a Homebrew curl
+  set -e
   if [[ -n "$HOMEBREW_FORCE_BREWED_CURL" &&
       ! -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]]
   then
     ohai "Installing Homebrew cURL"
-    brew install curl || odie "Failed to install cURL"
+    brew install curl
   fi
 
   if ! git --version &>/dev/null ||
      [[ -n "$HOMEBREW_FORCE_BREWED_GIT" &&
       ! -x "$HOMEBREW_PREFIX/opt/git/bin/git" ]]
   then
-    # we cannot install brewed git if homebrew/core is unavailable.
-    if [[ -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]]
-    then
-      ohai "Installing Homebrew Git"
-      brew install git || odie "Failed to install Git"
-    fi
+    ohai "Installing Homebrew Git"
+    brew install git
     unset GIT_EXECUTABLE
     if ! git --version &>/dev/null
     then
       odie "Git must be installed and in your PATH!"
     fi
   fi
+  set +e
   export GIT_TERMINAL_PROMPT="0"
   export GIT_SSH_COMMAND="ssh -oBatchMode=yes"