When git gem install fails, don't suggest `gem install foo`

2 files changed, 26 insertions, 2 deletions

diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index f6c1eaefc7..393cbe7c79 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -131,8 +131,12 @@ module Bundler
       Bundler.ui.info ""
       Bundler.ui.warn "#{e.class}: #{e.message}"
       msg = "An error occurred while installing #{spec.name} (#{spec.version}),"
-      msg << " and Bundler cannot continue.\nMake sure that `gem install"
-      msg << " #{spec.name} -v '#{spec.version}'` succeeds before bundling."
+      msg << " and Bundler cannot continue."
+
+      unless spec.source.options["git"]
+        msg << "\nMake sure that `gem install"
+        msg << " #{spec.name} -v '#{spec.version}'` succeeds before bundling."
+      end
       Bundler.ui.debug e.backtrace.join("\n")
       raise Bundler::InstallError, msg
     end
diff --git a/spec/install/git_spec.rb b/spec/install/git_spec.rb
index f970504d09..ae9e5a145b 100644
--- a/spec/install/git_spec.rb
+++ b/spec/install/git_spec.rb
@@ -853,6 +853,26 @@ describe "bundle install with git sources" do
       R
       expect(out).to eq("YES")
     end
+
+    it "does not prompt to gem install if extension fails" do
+      build_git "foo" do |s|
+        s.add_dependency "rake"
+        s.extensions << "Rakefile"
+        s.write "Rakefile", <<-RUBY
+          task :default do
+            raise
+          end
+        RUBY
+      end
+
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "foo", :git => "#{lib_path('foo-1.0')}"
+      G
+
+      expect(out).to include("An error occurred while installing foo (1.0)")
+      expect(out).not_to include("gem install foo")
+    end
   end
 
 end