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

update: fix --rebase

Browse Source
This commit is contained in:
Mike McQuaid 2015-07-09 23:50:55 +01:00
parent 0b740f51ab
commit 151890148c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/cmd/update.rb
View File

@ -148,11 +148,12 @@ class Updater
# ensure we don't munge line endings on checkout # ensure we don't munge line endings on checkout
safe_system "git", "config", "core.autocrlf", "false" safe_system "git", "config", "core.autocrlf", "false"
args = ["pull", "origin"] args = ["pull"]
args << "--rebase" if ARGV.include? "--rebase" args << "--rebase" if ARGV.include? "--rebase"
args += quiet
args << "origin"
# the refspec ensures that 'origin/master' gets updated # the refspec ensures that 'origin/master' gets updated
args << "refs/heads/master:refs/remotes/origin/master" args << "refs/heads/master:refs/remotes/origin/master"
args += quiet
reset_on_interrupt { safe_system "git", *args } reset_on_interrupt { safe_system "git", *args }