From: Sam <sam.saffron@gmail.com>
Date: Fri, 11 Dec 2020 06:29:24 +0000 (+1100)
Subject: Revert git command changes (#502)
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cbf97b11c0131d861f8038733ed092ddd99025ee;p=discourse_docker.git

Revert git command changes (#502)

* Revert "FIX: reset takes the full slash path (#501)"

This reverts commit bf223b05427d432d6ab313eb7740d42caa989c6a.

* Revert "FIX: Run reset and clean after checkout (#500)"

This reverts commit bc380c73eef970e57195159a654edd2b14fb633b.

* Revert "FIX: remove pull for Discourse core (#499)"

This reverts commit 0ab1da11598467b944182748b8e8c6d363093544.
---

diff --git a/templates/web.template.yml b/templates/web.template.yml
index ab6ba73..eb377ae 100644
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -86,12 +86,13 @@ run:
       cd: $home
       hook: code
       cmd:
+        - git reset --hard
+        - git clean -f
         - git remote set-branches --add origin master
+        - git pull
         - git remote set-branches origin $version
         - git fetch --depth 1 origin $version
         - git checkout $version
-        - git reset --hard origin/$version
-        - git clean -f
         - mkdir -p tmp
         - chown discourse:www-data tmp
         - mkdir -p tmp/pids