When running `bundle lock --update <name>`, checkout locked revision of unrelated git sources directly

Since Bundler 2.4, we will try to checkout any branch specified in the
Gemfile, while until Bundler 2.3 we would directly checkout the locked
revision.

This should not make any difference in most situations, but in some edge
cases, like if the branch specified in the `Gemfile` has been renamed,
but the locked revision still exist, it causes an error now while before
it would update the lockfile without issues.

I debated which behavior was best, since I was not sure. But my
conclusion is that if the situation does not require expiring the
lockfile source in favor of the Gemfile source, we should use the locked
revision directly and proceed happily. So I restored Bundler 2.3
behavior.

I think this is consistent with how yanked gems are handled, for example.

Of course, if explicitly updating the git source itself, or all gems, we
will still get any errors like missing branches related to the git source.
This commit is contained in:
David Rodríguez 2023-03-09 17:34:17 +01:00 коммит произвёл Hiroshi SHIBATA
Родитель 0b9e51c429
Коммит c65d7b4bea
2 изменённых файлов: 43 добавлений и 0 удалений

Просмотреть файл

@ -366,6 +366,11 @@ module Bundler
args += ["--single-branch"]
args.unshift("--no-tags") if supports_cloning_with_no_tags?
# If there's a locked revision, no need to clone any specific branch
# or tag, since we will end up checking out that locked revision
# anyways.
return args if @revision
args += ["--branch", branch || tag] if branch || tag
args
end

Просмотреть файл

@ -158,6 +158,44 @@ RSpec.describe "bundle lock" do
expect(out).not_to include("re-resolving dependencies because the list of sources changed")
end
it "updates specific gems using --update using the locked revision of unrelated git gems for resolving" do
ref = build_git("foo").ref_for("HEAD")
gemfile <<-G
source "#{file_uri_for(gem_repo1)}"
gem "rake"
gem "foo", :git => "#{file_uri_for(lib_path("foo-1.0"))}", :branch => "deadbeef"
G
lockfile <<~L
GIT
remote: #{file_uri_for(lib_path("foo-1.0"))}
revision: #{ref}
branch: deadbeef
specs:
foo (1.0)
GEM
remote: #{file_uri_for(gem_repo1)}/
specs:
rake (10.0.1)
PLATFORMS
#{lockfile_platforms}
DEPENDENCIES
foo!
rake
BUNDLED WITH
#{Bundler::VERSION}
L
bundle "lock --update rake --verbose"
expect(out).to match(/Writing lockfile to.+lock/)
expect(lockfile).to include("rake (13.0.1)")
end
it "errors when updating a missing specific gems using --update" do
lockfile @lockfile