bottle: allow --merge --write without commit

This commit is contained in:
Xu Cheng 2015-10-15 15:12:02 +08:00 committed by Mike McQuaid
parent 0114a26483
commit 1da0583634

View File

@ -343,7 +343,8 @@ module Homebrew
end end
end end
HOMEBREW_REPOSITORY.cd do unless ARGV.include? "--no-commit"
f.path.parent.cd do
safe_system "git", "commit", "--no-edit", "--verbose", safe_system "git", "commit", "--no-edit", "--verbose",
"--message=#{f.name}: #{update_or_add} #{f.pkg_version} bottle.", "--message=#{f.name}: #{update_or_add} #{f.pkg_version} bottle.",
"--", f.path "--", f.path
@ -351,6 +352,7 @@ module Homebrew
end end
end end
end end
end
def bottle def bottle
if ARGV.include? "--merge" if ARGV.include? "--merge"