From 6545958921676c27823fb2de84c43b017de79540 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 26 Oct 2021 08:56:56 -0700 Subject: [PATCH] Always pass HEAD to worktree Without this, repeated runs can end up using the same SHA (because of the "helpful" branch creation. --- hack/verify-generated-files-remake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/verify-generated-files-remake.sh b/hack/verify-generated-files-remake.sh index ea929c91985..35074f16aa6 100755 --- a/hack/verify-generated-files-remake.sh +++ b/hack/verify-generated-files-remake.sh @@ -33,7 +33,7 @@ _tmpdir="$(kube::realpath "$(mktemp -d -t verify-generated-files.XXXXXX)")" _tmp_gopath="${_tmpdir}/go" _tmp_kuberoot="${_tmp_gopath}/src/k8s.io/kubernetes" mkdir -p "${_tmp_kuberoot}/.." -git worktree add "${_tmp_kuberoot}" +git worktree add "${_tmp_kuberoot}" HEAD kube::util::trap_add "git worktree remove -f ${_tmp_kuberoot} && rm -rf ${_tmpdir}" EXIT cd "${_tmp_kuberoot}"