diff options
| author | Jesse Luehrs <doy@tozt.net> | 2020-06-15 01:57:33 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2020-06-15 01:57:33 -0400 |
| commit | ea4fc116c199b378fcf626b6ce636d1b6c6b4807 (patch) | |
| tree | 3b999ec0f78116ac769008b3a1c23a93cb2fa77a /modules/base | |
| parent | 62d900ac78aa00f9e9421a580149ad9ecd1b10a8 (diff) | |
| download | puppet-tozt-ea4fc116c199b378fcf626b6ce636d1b6c6b4807.tar.gz puppet-tozt-ea4fc116c199b378fcf626b6ce636d1b6c6b4807.zip | |
make sure we update the branch correctly
Diffstat (limited to 'modules/base')
| -rw-r--r-- | modules/base/files/puppet-tozt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/base/files/puppet-tozt b/modules/base/files/puppet-tozt index 05d300b..9ad7f1b 100644 --- a/modules/base/files/puppet-tozt +++ b/modules/base/files/puppet-tozt @@ -3,5 +3,5 @@ set -eu set -o pipefail branch=${1:-master} -(cd /usr/local/share/puppet-tozt && sudo git pull && sudo git checkout "$branch") +(cd /usr/local/share/puppet-tozt && sudo git pull && sudo git checkout "$branch" && sudo git reset --hard "origin/$branch") sudo puppet apply --show_diff --modulepath=/usr/local/share/puppet-tozt/modules /usr/local/share/puppet-tozt/manifests |