diff options
| author | Mike McQuaid | 2016-09-18 20:43:44 +0100 |
|---|---|---|
| committer | GitHub | 2016-09-18 20:43:44 +0100 |
| commit | 8e9a9b6428e5d6fea6d9808ab2c6101f598e0eb7 (patch) | |
| tree | 0738d4a9e6d3d7f2bb303f78e1d6583f5c2907e0 /Library | |
| parent | 027d8923f2812d7488307a35a5d3e915501e69f4 (diff) | |
| parent | 42e9782dd61eb991f29b5355575cca3265de77a9 (diff) | |
| download | brew-8e9a9b6428e5d6fea6d9808ab2c6101f598e0eb7.tar.bz2 | |
Merge pull request #1020 from MikeMcQuaid/migration-cleanup-git
update-report: cleanup git harder in migration.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/update-report.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 57b18b865..f64642469 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -208,6 +208,9 @@ module Homebrew unless Utils.popen_read("git status --untracked-files=all --porcelain").empty? 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", "-c", "user.name=brew update", "stash", "save", "--include-untracked" |