Browse files

Instead of pulling, fetch and hard-reset

Should prevent merge trouble.
  • Loading branch information...
1 parent feb8cbc commit ae26703cdb3fceccd286cd8d3f80ac09539f5955 @mxcl mxcl committed Aug 29, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 install
@@ -131,9 +131,11 @@ Dir.chdir "/usr/local" do
system git, "init", "-q"
system git, "remote", "add", "origin", ""
- args = git, "pull", "origin", "master", "--depth=1"
+ args = git, "fetch", "origin", "--depth=1"
args.pop unless ARGV.include? "--fast"
system *args
+ system git, "reset", "--hard", "origin/master"
# -m to stop tar erroring out if it can't modify the mtime for root owned directories
# pipefail to cause the exit status from curl to propogate if it fails

0 comments on commit ae26703

Please sign in to comment.