More uses of "fetch, reset --hard @{upstream}" instead of "pull".

See also 349522b6 .

stack/erp5.cfg

@@ -243,7 +243,7 @@ repository = http://git.erp5.org/repos/erp5.git
 branch = erp5-component
 revision =
 command = ${git:location}/bin/git clone --quiet --branch ${:branch} ${:repository} ${:location} && if [ -n "${:revision}" ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
-update-command = cd ${:location} && GIT_COMMITTER_EMAIL=nobody@example.com GIT_AUTHOR_NAME=Nobody GIT_AUTHOR_EMAIL=nobody@example.com ${git:location}/bin/git pull && if [ -n "${:revision}" ]; then echo "Resetting." ; cd ${:location} && ${git:location}/bin/git reset --hard ${:revision} ; fi
+update-command = cd "${:location}" && "${git:location}/bin/git" fetch && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --hard @{upstream} ; fi
 
 [products]
 # XXX: ERP5 related products are not defined as python distributions, so it is

stack/nbd.cfg

@@ -55,7 +55,7 @@ stop-on-error = true
 command =
   (${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} ) || (rm -fr ${:location} ; exit 1)
 update-command =
- cd ${:location} && ${git:location}/bin/git pull --quiet origin master
+  cd "${:location}" && "${git:location}/bin/git" fetch --quiet && "${git:location}/bin/git" reset --hard --quiet @{upstream}
 
 [instance-recipe]
 egg = slapos.cookbook