diff options
| author | Mike McQuaid | 2016-02-12 13:09:13 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2016-02-12 13:17:25 +0000 |
| commit | 59f1c24b43ef9b8deb6944bd8f854961fcf02a20 (patch) | |
| tree | 2d1f43e041b60c219cdc762dcd284e2794657aaf /Library | |
| parent | 9d6a1a693e7ce164869c082059e488c6c9596320 (diff) | |
| download | brew-59f1c24b43ef9b8deb6944bd8f854961fcf02a20.tar.bz2 | |
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>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/update-bash.sh | 9 |
1 files changed, 6 insertions, 3 deletions
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 |