diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-12-15 18:00:04 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-12-15 19:06:40 +0900 |
| commit | 49b0f3b024855efad66a386595eabd103058826d (patch) | |
| tree | 629182a46cb9e8b4bc9661878e07e1e9a539ac32 /lib/bundler/source/git.rb | |
| parent | 2581de112c1957dc4b5852e54337551dc8972c99 (diff) | |
Merge RubyGems/Bundler master
Pick from https://github.com/rubygems/rubygems/commit/084f7d1f21f6fc3e2bb685b7bda3653fb2891c6e
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6936
Diffstat (limited to 'lib/bundler/source/git.rb')
| -rw-r--r-- | lib/bundler/source/git.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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)} " \ |