bottle: allow --merge --write without commit

2015-10-15 15:12:02 +08:00 · 2015-10-15 15:12:02 +08:00 · 1da0583634
commit 1da0583634
parent 0114a26483
1 changed files with 6 additions and 4 deletions
--- 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