summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-02-10 20:37:47 -0800
committerCarl Lerche <carllerche@mac.com>2010-02-10 20:37:47 -0800
commit25cdf6136cc84378409f3cc3b60233091c031dec (patch)
tree11d20af92f9eb797913b1392ee22aa4a1508d932
parent6b1e0281ce26e087045348a088a2cbef20c0184a (diff)
parent3007c212a568c084e5fe2b4254693f8fa8b97568 (diff)
downloadbundler-25cdf6136cc84378409f3cc3b60233091c031dec.tar.gz
Merge remote branch 'pedro/master'
-rw-r--r--lib/bundler/source.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
index 727bb5bb5c..747edf0925 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -313,11 +313,10 @@ module Bundler
end
def checkout
- FileUtils.mkdir_p(path)
+ unless File.exist?(path + "/.git")
+ %x(git clone --no-checkout #{cache_path} #{path})
+ end
Dir.chdir(path) do
- unless File.exist?(".git")
- %x(git clone --no-checkout #{cache_path} #{path})
- end
git "fetch --quiet"
git "reset --hard #{revision}"
end