From 49b0f3b024855efad66a386595eabd103058826d Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Thu, 15 Dec 2022 18:00:04 +0900 Subject: Merge RubyGems/Bundler master Pick from https://github.com/rubygems/rubygems/commit/084f7d1f21f6fc3e2bb685b7bda3653fb2891c6e --- lib/bundler/source/git.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/bundler/source/git.rb') diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb index dc89dedeb2..b8ee4029b4 100644 --- a/lib/bundler/source/git.rb +++ b/lib/bundler/source/git.rb @@ -148,7 +148,7 @@ module Bundler "#{current_branch} but Gemfile specifies #{branch}" end - changed = cached_revision && cached_revision != git_proxy.revision + changed = cached_revision && cached_revision != revision if !Bundler.settings[:disable_local_revision_check] && changed && !@unlocked && !git_proxy.contains?(cached_revision) raise GitError, "The Gemfile lock is pointing to revision #{shortref_for_display(cached_revision)} " \ -- cgit v1.2.3