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

Merge pull request #879 from penman/checkout_warning

Browse Source 
Warn when changing branch on update
This commit is contained in:
Mike McQuaid 2016-09-08 09:06:41 +01:00 committed by GitHub
commit 12813b8b62
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/update.sh
View File

@ -242,6 +242,14 @@ EOS
INITIAL_BRANCH="$(git symbolic-ref --short HEAD 2>/dev/null)"
if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]]
then
if [[ -z "$HOMEBREW_DEVELOPER" ]]
then
echo "Checking out $UPSTREAM_BRANCH in $DIR..."
echo "To checkout $INITIAL_BRANCH in $DIR run:"
echo " 'cd $DIR && git checkout $INITIAL_BRANCH"
fi
# Recreate and check out `#{upstream_branch}` if unable to fast-forward
# it to `origin/#{@upstream_branch}`. Otherwise, just check it out.
if git merge-base --is-ancestor "$UPSTREAM_BRANCH" "origin/$UPSTREAM_BRANCH" &>/dev/null