diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index e1ba579eed27c163efea3e53dbf27edfb6f81677..54f4f95179fc0353d1a9879b285ee68713a2aa6f 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -124,7 +124,7 @@ reset_on_interrupt() { git reset --hard "$INITIAL_REVISION" "${QUIET_ARGS[@]}" fi - if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]] + if [[ -n "$HOMEBREW_DEVELOPER" ]] then pop_stash else @@ -225,10 +225,13 @@ pull() { trap '' SIGINT - if [[ -n "$HOMEBREW_DEVELOPER" ]] && - [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]] + if [[ -n "$HOMEBREW_DEVELOPER" ]] then - git checkout "${QUIET_ARGS[@]}" "$INITIAL_BRANCH" + if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]] + then + git checkout "$INITIAL_BRANCH" + fi + pop_stash else pop_stash_message