Merge commit '9ca772699a4a7b4ced7942b5eb888a48b173674b' into master

This commit is contained in:
Dan Hawkins 2021-09-16 16:01:59 +01:00
commit 8f7f366333

View file

@ -196,8 +196,8 @@ def docheckout(String gitURL, String revision, int cloneDepth, String reporootpa
],
doGenerateSubmoduleConfigurations: false,
extensions: [
[$class: 'GitLFSPull'],
[$class: 'CleanBeforeCheckout'],
[$class: 'GitLFSPull',timeout: 25],
[$class: 'CleanBeforeCheckout',timeout: 20],
[$class: 'CloneOption', depth: cloneDepth, noTags: false, reference: reporootpath, shallow: shallowClone, timeout: 120],
[$class: 'CheckoutOption', timeout: 120],
[$class: 'RelativeTargetDirectory', relativeTargetDir: targetDir],
@ -265,9 +265,9 @@ def gitsparserestore(String targetDir) {
"""
} else {
powershell """
git rm -rf . 2> nul
git clean -fxd 2> nul
git reset --hard 2> nul
git rm -rf . > \$null
git clean -fxd > \$null
git reset --hard > \$null
"""
}
}