summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2012-12-03 22:11:00 -0800
committerAndre Arko <andre@arko.net>2012-12-29 14:06:40 -0800
commit758d20632fb6a995ee5e0303c47b09432577a29a (patch)
treee67a30c82d7d9e2957a844244bef84dee77f06de
parent193711d1b7baae0999f62f063bfce9857897d171 (diff)
downloadbundler-758d20632fb6a995ee5e0303c47b09432577a29a.tar.gz
awesome. I broke the matrix build, too.
Conflicts: Rakefile
-rw-r--r--Rakefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Rakefile b/Rakefile
index d619f3d84d..78961053a4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -84,9 +84,12 @@ begin
Dir.chdir("tmp/rubygems") do
system("git remote update")
- system("git checkout #{rg}")
- system("git pull origin master") if rg == "master"
- hash = `git rev-parse HEAD`.strip
+ if rg == "master"
+ system("git checkout origin/master")
+ else
+ system("git checkout #{rg}")
+ end
+ hash = `git rev-parse HEAD`.chomp
end
puts "Running bundler specs against rubygems '#{rg}' at #{hash}"