diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2024-11-19 21:21:20 +0100 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2024-11-21 10:37:51 +0000 |
| commit | ac5661db7b2298c70eb2bf5676cc3f920a640c49 (patch) | |
| tree | 4c502b041c486374e123c5cec2d889607d9f4979 /lib | |
| parent | 486485a535ece120dec5daa37c6b06c9d3af7e17 (diff) | |
[rubygems/rubygems] Fix locking of incorrect version of git gem in an edge case
In particular, when a gem registry transitive dependency is changed to a
git source direct dependency.
https://github.com/rubygems/rubygems/commit/bcdc7660d9
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/definition.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 52699d14be..bf259d8ef5 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -950,7 +950,7 @@ module Bundler if dep gemfile_source = dep.source || default_source - deps << dep if !dep.source || lockfile_source.include?(dep.source) + deps << dep if !dep.source || lockfile_source.include?(dep.source) || new_deps.include?(dep) # Replace the locked dependency's source with the equivalent source from the Gemfile s.source = gemfile_source |