From ea4fc116c199b378fcf626b6ce636d1b6c6b4807 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Mon, 15 Jun 2020 01:57:33 -0400 Subject: make sure we update the branch correctly --- 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 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 -- cgit v1.2.3-54-g00ecf