update: also update master when updating stable branch.

2018-11-25 20:16:13 +00:00 · 2018-11-25 20:16:13 +00:00 · 9aee39825d
commit 9aee39825d
parent 2063a8a4d8
1 changed files with 5 additions and 0 deletions
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@ -266,6 +266,11 @@ EOS
    then
      git checkout --force "$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}"
    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[@]}"
    fi
  fi