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

Merge pull request #1007 from MikeMcQuaid/update-remote-ref

Browse Source 
update.sh: turn origin/branch into a variable.
This commit is contained in:
Mike McQuaid 2016-09-18 15:32:44 +01:00 committed by GitHub
commit ad466452de
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,6 +215,8 @@ merge_or_rebase() {
trap reset_on_interrupt SIGINT
REMOTE_REF="origin/$UPSTREAM_BRANCH"
if [[ -n "$(git status --untracked-files=all --porcelain 2>/dev/null)" ]]
then
if [[ -n "$HOMEBREW_VERBOSE" ]]
@ -252,11 +254,11 @@ EOS
# 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
if git merge-base --is-ancestor "$UPSTREAM_BRANCH" "$REMOTE_REF" &>/dev/null
then
git checkout --force "$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}"
else
git checkout --force -B "$UPSTREAM_BRANCH" "origin/$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}"
git checkout --force -B "$UPSTREAM_BRANCH" "$REMOTE_REF" "${QUIET_ARGS[@]}"
fi
fi
@ -268,9 +270,9 @@ EOS
if [[ -z "$HOMEBREW_MERGE" ]]
then
git rebase "${QUIET_ARGS[@]}" "origin/$UPSTREAM_BRANCH"
git rebase "${QUIET_ARGS[@]}" "$REMOTE_REF"
else
git merge --no-edit --ff "${QUIET_ARGS[@]}" "origin/$UPSTREAM_BRANCH" \
git merge --no-edit --ff "${QUIET_ARGS[@]}" "$REMOTE_REF" \
--strategy=recursive \
--strategy-option=ours \
--strategy-option=ignore-all-space