admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

cmd/update-bash.sh: print message on fetch fail.

Browse Source 
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:
Mike McQuaid 2016-02-12 13:09:13 +00:00
parent 9d6a1a693e
commit 59f1c24b43
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/cmd/update-bash.sh
View File

@ -189,7 +189,7 @@ pull() {
export HOMEBREW_UPDATE_AFTER"$TAP_VAR"="$CURRENT_REVISION" export HOMEBREW_UPDATE_AFTER"$TAP_VAR"="$CURRENT_REVISION"
if ! git merge-base --is-ancestor "$INITIAL_REVISION" "$CURRENT_REVISION" if ! git merge-base --is-ancestor "$INITIAL_REVISION" "$CURRENT_REVISION"
then then
odie "Your HEAD is not a descendant of $UPSTREAM_BRANCH!" odie "Your $DIR HEAD is not a descendant of $UPSTREAM_BRANCH!"
fi fi
return return
fi fi
@ -333,8 +333,11 @@ EOS
cd "$DIR" || continue cd "$DIR" || continue
UPSTREAM_BRANCH="$(upstream_branch)" UPSTREAM_BRANCH="$(upstream_branch)"
# the refspec ensures that the default upstream branch gets updated # 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 done
wait wait