mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-15 19:56:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix brew update local changes bug

Browse Source 
Users were seeing local changes in their repository after updating, even
though they had made no local changes.

The repository setup sequence should use `git reset --soft` rather than
vanilla `git reset`, which defaults to '--mixed'. '--soft' updates
_only_ HEAD, leaving the index as-is, allowing future incantations of
`brew update` to proceed without errors.

Fixes Homebrew/homebrew#6732.
This commit is contained in:
Jack Nagel 2011-07-30 19:32:35 -05:00 committed by Max Howell
parent 616b52e627
commit fd6c9833c6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ class RefreshBrew
begin begin
safe_system "git init" safe_system "git init"
safe_system "git fetch #{REPOSITORY_URL}" safe_system "git fetch #{REPOSITORY_URL}"
safe_system "git reset FETCH_HEAD" safe_system "git reset --soft FETCH_HEAD"
rescue Exception rescue Exception
safe_system "rm -rf .git" safe_system "rm -rf .git"
raise raise