diff options
| author | Xu Cheng | 2015-10-15 15:12:02 +0800 |
|---|---|---|
| committer | Mike McQuaid | 2015-10-15 09:05:51 +0100 |
| commit | 1da05836342f0ee0cae541575378b46945c146f7 (patch) | |
| tree | c0286c71c42886d74cd611a33f8759c99b724b1f /Library | |
| parent | 0114a26483dd240a9c76c0f7cc414b8c426afbe6 (diff) | |
| download | brew-1da05836342f0ee0cae541575378b46945c146f7.tar.bz2 | |
bottle: allow --merge --write without commit
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/bottle.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index c63c5ae06..fb9d52ffe 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -343,10 +343,12 @@ module Homebrew end end - HOMEBREW_REPOSITORY.cd do - safe_system "git", "commit", "--no-edit", "--verbose", - "--message=#{f.name}: #{update_or_add} #{f.pkg_version} bottle.", - "--", f.path + unless ARGV.include? "--no-commit" + f.path.parent.cd do + safe_system "git", "commit", "--no-edit", "--verbose", + "--message=#{f.name}: #{update_or_add} #{f.pkg_version} bottle.", + "--", f.path + end end end end |
