From 59f1c24b43ef9b8deb6944bd8f854961fcf02a20 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Fri, 12 Feb 2016 13:09:13 +0000
Subject: cmd/update-bash.sh: print message on fetch fail.

Closes Homebrew/homebrew#49107.
Closes Homebrew/homebrew#49105.
Closes Homebrew/homebrew#48267.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
---
 Library/Homebrew/cmd/update-bash.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/cmd/update-bash.sh b/Library/Homebrew/cmd/update-bash.sh
index f75abb614..4a0a2699c 100644
--- a/Library/Homebrew/cmd/update-bash.sh
+++ b/Library/Homebrew/cmd/update-bash.sh
@@ -189,7 +189,7 @@ pull() {
     export HOMEBREW_UPDATE_AFTER"$TAP_VAR"="$CURRENT_REVISION"
     if ! git merge-base --is-ancestor "$INITIAL_REVISION" "$CURRENT_REVISION"
     then
-      odie "Your HEAD is not a descendant of $UPSTREAM_BRANCH!"
+      odie "Your $DIR HEAD is not a descendant of $UPSTREAM_BRANCH!"
     fi
     return
   fi
@@ -333,8 +333,11 @@ EOS
     cd "$DIR" || continue
     UPSTREAM_BRANCH="$(upstream_branch)"
     # the refspec ensures that the default upstream branch gets updated
-    git fetch "${QUIET_ARGS[@]}" origin \
-      "refs/heads/$UPSTREAM_BRANCH:refs/remotes/origin/$UPSTREAM_BRANCH" &
+    (
+      git fetch "${QUIET_ARGS[@]}" origin \
+        "refs/heads/$UPSTREAM_BRANCH:refs/remotes/origin/$UPSTREAM_BRANCH" || \
+          odie "Fetching $DIR failed!"
+    ) &
   done
 
   wait
-- 
cgit v1.2.3