lib/gitscape/base.rb in gitscape-1.3.7 vs lib/gitscape/base.rb in gitscape-1.3.8

- old
+ new

@@ -198,15 +198,15 @@ end end # Checkout release branch puts `git checkout #{release_branch_name}` - puts `git pull #{release_branch_name}` + puts `git pull origin #{release_branch_name}` # Checkout live puts `git checkout live` - puts `git pull live` + puts `git pull origin live` # Record the revision of live used for the rollback tag live_rollback_revision = `git log -n1 --oneline`.scan(/(^[^ ]+) .*$/).flatten[0] merge_options = "--no-ff -s recursive -Xignore-space-change" @@ -234,10 +234,10 @@ # Record the revision of live used for the release tag live_release_revision = `git log -n1 --oneline`.scan(/(^[^ ]+) .*$/).flatten[0] # Merge the release branch into master puts `git checkout master` - puts `git pull master` + puts `git pull origin master` puts `git merge #{merge_options} #{release_branch_name}` # Error and conflict checking if !$?.success? then exit 4 end if git_has_conflicts then