Merge pull request #1723 from avimar/git-order

Fix order for git checkout / git pull
saltstack · Jul 29, 2012 · 0195b36 · 0195b36
2 parents 63d6e96 + 08693a7
commit 0195b36
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/salt/states/git.py b/salt/states/git.py
@@ -70,9 +70,11 @@ def latest(name,
                     ret,
                     ('Repository {0} update is probably required (current '
                     'revision is {1})').format(target, current_rev))
+
+        __salt__['git.pull'](target, user=runas)
+
         if rev:
             __salt__['git.checkout'](target, rev, user=runas)
-        __salt__['git.pull'](target, user=runas)
 
         if submodules:
             __salt__['git.submodule'](target, user=runas)