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>
This commit is contained in:
parent
9d6a1a693e
commit
59f1c24b43
@ -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" &
|
||||
"refs/heads/$UPSTREAM_BRANCH:refs/remotes/origin/$UPSTREAM_BRANCH" || \
|
||||
odie "Fetching $DIR failed!"
|
||||
) &
|
||||
done
|
||||
|
||||
wait
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user