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

Merge pull request #1020 from MikeMcQuaid/migration-cleanup-git

Browse Source 
update-report: cleanup git harder in migration.
This commit is contained in:
Mike McQuaid 2016-09-18 20:43:44 +01:00 committed by GitHub
commit 8e9a9b6428
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cmd/update-report.rb
View File

@ -208,6 +208,9 @@ module Homebrew
unless Utils.popen_read("git status --untracked-files=all --porcelain").empty? unless Utils.popen_read("git status --untracked-files=all --porcelain").empty?
HOMEBREW_REPOSITORY.cd do HOMEBREW_REPOSITORY.cd do
quiet_system "git", "merge", "--abort"
quiet_system "git", "rebase", "--abort"
quiet_system "git", "reset", "--mixed"
safe_system "git", "-c", "user.email=brew-update@localhost", safe_system "git", "-c", "user.email=brew-update@localhost",
"-c", "user.name=brew update", "-c", "user.name=brew update",
"stash", "save", "--include-untracked" "stash", "save", "--include-untracked"