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

update: also update master when updating stable branch.

Browse Source
This commit is contained in:
Mike McQuaid 2018-11-25 20:16:13 +00:00
parent 2063a8a4d8
commit 9aee39825d
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,6 +266,11 @@ EOS
then then
git checkout --force "$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}" git checkout --force "$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}"
else else
if [[ -n "$UPSTREAM_TAG" && "$UPSTREAM_BRANCH" != "master" ]]
then
git checkout --force -B "master" "origin/master" "${QUIET_ARGS[@]}"
fi
git checkout --force -B "$UPSTREAM_BRANCH" "$REMOTE_REF" "${QUIET_ARGS[@]}" git checkout --force -B "$UPSTREAM_BRANCH" "$REMOTE_REF" "${QUIET_ARGS[@]}"
fi fi
fi fi