FIX: correct branch stuff
authorSam <sam.saffron@gmail.com>
Tue, 1 Jul 2014 00:32:52 +0000 (10:32 +1000)
committerSam <sam.saffron@gmail.com>
Tue, 1 Jul 2014 00:32:52 +0000 (10:32 +1000)
templates/web.template.yml

index 6056861870c0bd9e7811e62fb67769fe3b790e14..7bc261a16fac64c4416422bb8bb07d6f25caa46f 100644 (file)
@@ -64,8 +64,9 @@ run:
       cmd:
         - git reset --hard
         - git clean -f
-        - git pull origin $version
+        - git branch $version || echo branch exists
         - git checkout $version
+        - git pull origin $version
         - mkdir -p tmp/pids
         - mkdir -p tmp/sockets
         - mkdir -p /shared/log/rails