Suggest different command depending on where 'frozen' config is set

2 files changed, 11 insertions, 1 deletions

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index bf3c34d9ff..8e8897df02 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -409,8 +409,10 @@ module Bundler
              "updated #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} to version control."
 
       unless explicit_flag
+
+        suggested_command = Bundler.settings.locations("frozen")[:global] == "1" ? "bundle config --delete frozen" : "bundle install --no-deployment"
         msg << "\n\nIf this is a development machine, remove the #{Bundler.default_gemfile} " \
-               "freeze \nby running `bundle install --no-deployment`."
+               "freeze \nby running `#{suggested_command}`."
       end
 
       added =   []
diff --git a/spec/commands/update_spec.rb b/spec/commands/update_spec.rb
index bb24c501e9..4992e428da 100644
--- a/spec/commands/update_spec.rb
+++ b/spec/commands/update_spec.rb
@@ -159,8 +159,16 @@ RSpec.describe "bundle update" do
       bundle "update"
 
       expect(out).to match(/You are trying to install in deployment mode after changing.your Gemfile/m)
+      expect(out).to match(/freeze \nby running `bundle install --no-deployment`./m)
       expect(exitstatus).not_to eq(0) if exitstatus
     end
+
+    it "should suggest different command when frozen is set globally" do
+      bundler "config --global frozen 1"
+      bundle "update"
+      expect(out).to match(/You are trying to install in deployment mode after changing.your Gemfile/m)
+      expect(out).to match(/freeze \nby running `bundle config --delete frozen`./m)
+    end
   end
 
   describe "with --source option" do