From 4e46881ae9d1484c5868af070a45346ff1a6c1e9 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 8 Jan 2023 18:34:25 +0000 Subject: [PATCH] Squashed 'autobuild/Common_scripts/' changes from 78da6d1..9a7161e 9a7161e Git LFS not installing on windows powershell 75631d9 Git LFS not installing on windows powershell e652bd6 Merge commit '616c8b13a0ac8724042d688529a9f472ac8c7c2d' b236c7c Correct merge dcccf93 Merge commit 'a88d5c4c23c582ef4b89d3188eacbcf4a5e4968e' 5322cab Merge commit '21b372134d83845304e09f49882cbd648d9468b3' git-subtree-dir: autobuild/Common_scripts git-subtree-split: 9a7161e06c7dfcbe0f59b6f263512f2e473499cf --- versioncontrol/git.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/versioncontrol/git.groovy b/versioncontrol/git.groovy index bd389c3..9725650 100644 --- a/versioncontrol/git.groovy +++ b/versioncontrol/git.groovy @@ -102,7 +102,7 @@ def String checkouttoreporoot(String gitURL) { branches: [ [name: 'origin/master'] ], - doGenerateSubmoduleConfigurations: false, + doGenerateSubmoduleConfigurations: false, extensions: [ [$class: 'GitLFSPull'], [$class: 'CleanBeforeCheckout'], @@ -134,6 +134,7 @@ def String checkouttoreporoot(String gitURL) { } def checkgitlfsinstall() { + echo "Doing: git lfs install" if (isUnix()) { sh """ git lfs install @@ -142,6 +143,7 @@ def checkgitlfsinstall() { } else { powershell """ + git config --unset core.hooksPath git lfs install if (\$lastexitcode -ge 1) { exit 1 } """ @@ -307,7 +309,7 @@ def gitsparserestore(String targetDir) { def List convertSparseItemsString(String itemstopublish) { def List sparsepaths = [] - + boolean nonempty = itemstopublish?.trim() if (nonempty) { def String[] items = itemstopublish.trim().split(',')