Fixed branch selection logic for git deploys

* Before, because the logic was revered (see
  c0e46393c6), a brand new deploy would
  result in assuming that the deploy branch existed when it actually
  did not. This would cause initial deploys to fail.
* This new logic is more concise, more readable, and still backwards
  compatible with ruby 1.8.
master
Ryan McGeary 2013-05-30 10:25:03 -04:00
parent 00e00ee96d
commit e854adb5a6
1 changed files with 1 additions and 1 deletions

View File

@ -158,7 +158,7 @@ EOF
end
#if there is a branch with that name, switch to it, otherwise create a new one and switch to it
if `git branch`.split("\n").delete_if{ |r| r =~ Regexp.new(branch,true) }.count == 0
if `git branch`.split("\n").any? { |b| b =~ /#{branch}/i }
`git checkout #{branch}`
else
`git checkout -b #{branch}`