diff options
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" |