diff options
| author | Jesse Luehrs <doy@tozt.net> | 2020-06-16 01:44:09 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2020-06-16 01:44:09 -0400 |
| commit | c987bc4bf66d8f76fe40304af503d358a8794931 (patch) | |
| tree | 1a95d5509a419c3ccdfb72dc107e5c893af47eaa /modules/base | |
| parent | cda8a0aa57cab46a556208b4060646a55e0b1123 (diff) | |
| download | puppet-tozt-c987bc4bf66d8f76fe40304af503d358a8794931.tar.gz puppet-tozt-c987bc4bf66d8f76fe40304af503d358a8794931.zip | |
handle nonexistent branches
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 df62200..3d9c4f4 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 checkout "$branch" && sudo git pull && sudo git submodule update --init --recursive && sudo git reset --hard "origin/$branch") +(cd /usr/local/share/puppet-tozt && sudo git checkout -B "$branch" && sudo git pull && sudo git submodule update --init --recursive && sudo git reset --hard "origin/$branch") sudo ruby -W0 /usr/bin/puppet apply --show_diff --modulepath=/usr/local/share/puppet-tozt/modules --hiera_config=/usr/local/share/puppet-tozt/hiera/hiera.yaml /usr/local/share/puppet-tozt/manifests |