Do not resolve if the local override did not change.

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
index 23676dec..195c7dc5 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -714,13 +714,15 @@ module Bundler
             "#{git_proxy.branch} but Gemfile specifies #{options["branch"]}"
         end
 
-        rev = cached_revision
+        changed = cached_revision && cached_revision != git_proxy.revision
 
-        if rev && rev != git_proxy.revision && !git_proxy.contains?(rev)
-          raise GitError, "The Gemfile lock is pointing to revision #{shortref_for_display(rev)} " \
+        if changed && !git_proxy.contains?(cached_revision)
+          raise GitError, "The Gemfile lock is pointing to revision #{shortref_for_display(cached_revision)} " \
             "but the current branch in your local override for #{name} does not contain such commit. " \
             "Please make sure your branch is up to date."
         end
+
+        changed
       end
 
       # TODO: actually cache git specs