[rubygems/rubygems] Fix git source conservativeness

https://github.com/rubygems/rubygems/commit/9a0e0dfd5b

2 files changed, 8 insertions, 0 deletions

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 2fbd56e5d7..564530a98c 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -819,6 +819,7 @@ module Bundler
 
           @specs_that_changed_sources << s if gemfile_source != lockfile_source
           deps << dep if !dep.source || lockfile_source.include?(dep.source)
+          @unlock[:gems] << name if lockfile_source.include?(dep.source) && lockfile_source != gemfile_source
 
           # Replace the locked dependency's source with the equivalent source from the Gemfile
           s.source = gemfile_source
diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb
index 4a9f3731bd..adbce5fce4 100644
--- a/lib/bundler/source/git.rb
+++ b/lib/bundler/source/git.rb
@@ -67,6 +67,13 @@ module Bundler
 
       alias_method :==, :eql?
 
+      def include?(other)
+        other.is_a?(Git) && uri == other.uri &&
+          name == other.name &&
+          glob == other.glob &&
+          submodules == other.submodules
+      end
+
       def to_s
         begin
           at = humanized_ref || current_branch