Skip to content
Snippets Groups Projects
Commit d70841db authored by Mike McQuaid's avatar Mike McQuaid
Browse files

update.sh: turn origin/branch into a variable.

Rather than repeating origin multiple times.
parent c419f928
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment