diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-26 13:53:47 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-26 13:53:47 -0200 |
| commit | 52ee9fc170d983c94a5f310cb7bece3c7d11d69e (patch) | |
| tree | 6462bc57fc834071142323093d508d4a977faf25 | |
| parent | ee2fb8b32ff687f26a9d87deef235fb8f5f0aff3 (diff) | |
| download | puppet-puppet-52ee9fc170d983c94a5f310cb7bece3c7d11d69e.tar.gz puppet-puppet-52ee9fc170d983c94a5f310cb7bece3c7d11d69e.tar.bz2 | |
Resetting to HEAD instead of doing a git checkout in the update script
| -rw-r--r-- | files/update-puppet-conf.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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 |