Fix the logic that detects if the local clone of a git repository is …

…up to date.
johnantoni · Aug 29, 2010 · 108f5d7 · 108f5d7
1 parent ff93641
commit 108f5d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
@@ -620,7 +620,7 @@ def checkout
 
       def has_revision_cached?
         return unless @revision
-        in_cache { git %|rev-parse --verify --quiet #{@revision}| }
+        in_cache { git %|cat-file -e #{@revision}| }
         true
       rescue GitError
         false

diff --git a/spec/install/git_spec.rb b/spec/install/git_spec.rb
@@ -519,7 +519,7 @@
 
       lockfile = File.read(bundled_app("Gemfile.lock"))
       File.open(bundled_app("Gemfile.lock"), "w") do |file|
-        file.puts lockfile.gsub(/revision: #{old_revision[0..6]}/, "revision: #{new_revision[0..6]}")
+        file.puts lockfile.gsub(/revision: #{old_revision}/, "revision: #{new_revision}")
       end
 
       bundle "install"