From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 26 Jan 2013 15:53:47 +0000 (-0200)
Subject: Resetting to HEAD instead of doing a git checkout in the update script
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=52ee9fc170d983c94a5f310cb7bece3c7d11d69e;p=puppet-puppet.git

Resetting to HEAD instead of doing a git checkout in the update script
---

diff --git a/files/update-puppet-conf.sh b/files/update-puppet-conf.sh
index ef7bfcd..5e9adae 100644
--- a/files/update-puppet-conf.sh
+++ b/files/update-puppet-conf.sh
@@ -12,8 +12,9 @@ unset GIT_DIR
 
 if [ -d "${PUPPET_DIR}/.git" ] && [ -d "${ORIGIN_DIR}" ]; then
   cd ${PUPPET_DIR}
+  #git checkout -f
+  git reset HEAD --hard
   git pull ${ORIGIN_DIR} master
-  git checkout -f
   # See https://github.com/git/git/commit/c1c259e225cf39c7353c673ad2c7c84450d909c1
   git submodule update --init | grep -v "^Submodule "
   git clean -d -f