diff options
| author | Mike McQuaid | 2016-09-18 20:25:18 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2016-09-18 20:25:18 +0100 |
| commit | 42e9782dd61eb991f29b5355575cca3265de77a9 (patch) | |
| tree | 0738d4a9e6d3d7f2bb303f78e1d6583f5c2907e0 | |
| parent | 027d8923f2812d7488307a35a5d3e915501e69f4 (diff) | |
| download | brew-42e9782dd61eb991f29b5355575cca3265de77a9.tar.bz2 | |
update-report: cleanup git harder in migration.
Before stashing also try to cancel any current merge, rebase and
reset. This will prevent any data loss but also make the stash more
likely to succeed.
| -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" |