From: Sam <sam.saffron@gmail.com>
Date: Tue, 1 Jul 2014 00:32:52 +0000 (+1000)
Subject: FIX: correct branch stuff
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1df1f13dde1a06741a932baf32d4ecf5c4df3e04;p=discourse_docker.git

FIX: correct branch stuff
---

diff --git a/templates/web.template.yml b/templates/web.template.yml
index 6056861..7bc261a 100644
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -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