diff options
| author | Max Howell | 2011-06-15 13:00:13 +0100 |
|---|---|---|
| committer | Max Howell | 2011-06-15 13:02:48 +0100 |
| commit | 8bec9b18ef844eb915c505103c14bfd14fc3837a (patch) | |
| tree | 16d6ae0b53bf19836507fb0db65deefbbf8046bb /Library | |
| parent | cae8f9e21d586022f86a523e8e3ee2d7521140dc (diff) | |
| download | homebrew-8bec9b18ef844eb915c505103c14bfd14fc3837a.tar.bz2 | |
Fix first `brew update` with Git 1.7.4+; Fixes #5128
Behaviour for git checkout was changed such that the update would fail because it refused to checkout files on to existing files in the working directory.
This was bad behaviour anyway, we should make efforts to keep any local modifications to the Homebrew checkout. Everything is neatly resolved if we just do a --soft reset.
Closes #6017.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/update.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb index 944e7304a..f810acda0 100644 --- a/Library/Homebrew/cmd/update.rb +++ b/Library/Homebrew/cmd/update.rb @@ -13,7 +13,6 @@ end class RefreshBrew REPOSITORY_URL = "http://github.com/mxcl/homebrew.git" - INIT_COMMAND = "git init" CHECKOUT_COMMAND = "git checkout -q master" UPDATE_COMMAND = "git pull #{REPOSITORY_URL} master" REVISION_COMMAND = "git rev-parse HEAD" @@ -40,7 +39,14 @@ class RefreshBrew safe_system CHECKOUT_COMMAND @initial_revision = read_revision else - safe_system INIT_COMMAND + begin + safe_system "git init" + safe_system "git fetch #{REPOSITORY_URL}" + safe_system "git reset FETCH_HEAD" + rescue Exception + safe_system "rm -rf .git" + raise + end end execute(UPDATE_COMMAND) @current_revision = read_revision |