git.rb in bundler-1.3.5

- old
+ new

@@ -90,10 +90,11 @@
 
       alias :path :install_path
 
       def unlock!
         git_proxy.revision = nil
+        @unlocked = true
       end
 
       def local_override!(path)
         return false if local?
 
@@ -122,10 +123,10 @@
             "#{git_proxy.branch} but Gemfile specifies #{options["branch"]}"
         end
 
         changed = cached_revision && cached_revision != git_proxy.revision
 
-        if changed && !git_proxy.contains?(cached_revision)
+        if changed && !@unlocked && !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
 