Avoid writing .bundle unecessarily

2 files changed, 8 insertions, 5 deletions

diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 6a75078cc5..8818fd03ed 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -31,7 +31,7 @@ module Bundler
       raise InvalidOption, e.message
     ensure
       self.options ||= {}
-      Bundler.settings[:options_given] = !options.empty?
+      Bundler.settings.cli_flags_given = !options.empty?
       Bundler.ui = UI::Shell.new(options)
       Bundler.ui.level = "debug" if options["verbose"]
 
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index e8daa98f6e..ff0b146054 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -31,10 +31,13 @@ module Bundler
       :timeout => 10,
     }.freeze
 
+    attr_accessor :cli_flags_given
+
     def initialize(root = nil)
-      @root          = root
-      @local_config  = load_config(local_config_file)
-      @global_config = load_config(global_config_file)
+      @root            = root
+      @local_config    = load_config(local_config_file)
+      @global_config   = load_config(global_config_file)
+      @cli_flags_given = false
     end
 
     def [](name)
@@ -54,7 +57,7 @@ module Bundler
     end
 
     def []=(key, value)
-      if self[:options_given]
+      if cli_flags_given
         command = if value.nil?
           "bundle config --delete #{key}"
         else