diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/update-ruby.rb | 7 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/update.sh | 8 |
2 files changed, 2 insertions, 13 deletions
diff --git a/Library/Homebrew/cmd/update-ruby.rb b/Library/Homebrew/cmd/update-ruby.rb index 98294bca8..c49de4980 100644 --- a/Library/Homebrew/cmd/update-ruby.rb +++ b/Library/Homebrew/cmd/update-ruby.rb @@ -278,12 +278,7 @@ class Updater @current_revision = read_current_revision - if @initial_branch != @upstream_branch && !@initial_branch.empty? - safe_system "git", "checkout", @initial_branch, *@quiet_args - pop_stash - else - pop_stash_message - end + pop_stash_message end def pop_stash diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index 4841c96bd..712448264 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -239,13 +239,7 @@ pull() { trap '' SIGINT - if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]] - then - git checkout "$INITIAL_BRANCH" "${QUIET_ARGS[@]}" - pop_stash - else - pop_stash_message - fi + pop_stash_message trap - SIGINT } |
