Skip to content

Commit

Permalink
Fixed errors that were breaking tests
Browse files Browse the repository at this point in the history
  • Loading branch information
philly-mac committed Aug 11, 2012
1 parent 0b3359d commit 6165d69
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .rvmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rvm --create use 1.9.2@deploy
rvm --create use 1.9.3@deploy

4 changes: 2 additions & 2 deletions lib/deploy/common_methods.rb
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ def self.included(base)
file_not_exists "#{local_repo}", [ "git clone #{server_repo} #{app_name}" ]
remote "cd #{local_repo}"
remote "git pull"
on_bad_exit "git co #{dep_config(:git_branch)}", [
"git checkout -t -b #{dep_config(:git_branch)} #{dep_config(:git_branch_origin)}/#{dep_config(:git_branch)}"
on_bad_exit "git co #{dep_config.get(:git_branch)}", [
"git checkout -t -b #{dep_config.get(:git_branch)} #{dep_config.get(:git_branch_origin)}/#{dep_config.get(:git_branch)}"
]
file_exists "#{local_repo}.zip", [ "rm #{local_repo}.zip" ]
remote "git archive -o #{local_repo}.zip HEAD"
Expand Down

0 comments on commit 6165d69

Please sign in to comment.