From c987bc4bf66d8f76fe40304af503d358a8794931 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Tue, 16 Jun 2020 01:44:09 -0400 Subject: handle nonexistent branches --- modules/base/files/puppet-tozt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/base') 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 -- cgit v1.2.3-54-g00ecf