From 6e9eafb7ed6a841e3c8eff8e3a674037a9f30f26 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Sun, 6 Nov 2016 20:11:26 -0800 Subject: Do a git-reset after using git --worktree checkout --- scripts/doVcpkgRelease.ps1 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts') diff --git a/scripts/doVcpkgRelease.ps1 b/scripts/doVcpkgRelease.ps1 index 97656ba69..fb964d0c3 100644 --- a/scripts/doVcpkgRelease.ps1 +++ b/scripts/doVcpkgRelease.ps1 @@ -54,6 +54,7 @@ for ($disableMetrics = 0; $disableMetrics -le 1; $disableMetrics++) $checkoutForBuildOnly = ".\scripts",".\toolsrc",".vcpkg-root" # Must be relative to the root of the repository Write-Verbose("Creating partial temporary checkout: $buildPath") git --git-dir="$dotGitDir" --work-tree="$workTreeForBuildOnly" checkout $gitHash -f -q -- $checkoutForBuildOnly + git reset & "$buildPath\scripts\bootstrap.ps1" -disableMetrics $disableMetrics @@ -62,6 +63,7 @@ for ($disableMetrics = 0; $disableMetrics -le 1; $disableMetrics++) $checkoutThisDir = ".\" # Must be relative to the root of the repository Write-Verbose("Creating temporary checkout: $releasePath") git --git-dir=$dotGitDir --work-tree=$workTree checkout $gitHash -f -q -- $checkoutThisDir + git reset Copy-Item $buildPath\vcpkg.exe $releasePath\vcpkg.exe | Out-Null Copy-Item $buildPath\scripts\vcpkgmetricsuploader.exe $releasePath\scripts\vcpkgmetricsuploader.exe | Out-Null -- cgit v1.2.3