aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd/update.rb
diff options
context:
space:
mode:
authorMax Howell2011-08-06 11:11:06 +0100
committerMax Howell2011-08-06 11:11:06 +0100
commit9e5e27b425d69d1a7b68f6f6a584c22b268738b2 (patch)
tree2fabc127a291301d24b93c2c6ebf28c063d6b72a /Library/Homebrew/cmd/update.rb
parent2abfba1a91bfda3017d23a631ef237933e29c2f5 (diff)
downloadhomebrew-9e5e27b425d69d1a7b68f6f6a584c22b268738b2.tar.bz2
Reset --hard after the first git init
We don't know what revision the tarball was when homebrew was installed, so all we can do really is hard reset. In theory some set of git commands should suffice, but apparently --soft and --mixed resets ended up putting stuff in the index which would break subsequent `brew updates`. Fixes #6851
Diffstat (limited to 'Library/Homebrew/cmd/update.rb')
-rw-r--r--Library/Homebrew/cmd/update.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb
index c225b9176..03ff29071 100644
--- a/Library/Homebrew/cmd/update.rb
+++ b/Library/Homebrew/cmd/update.rb
@@ -42,7 +42,7 @@ class RefreshBrew
begin
safe_system "git init"
safe_system "git fetch #{REPOSITORY_URL}"
- safe_system "git reset --soft FETCH_HEAD"
+ safe_system "git reset --hard FETCH_HEAD"
rescue Exception
safe_system "rm -rf .git"
raise