3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 06:08:07 +08:00
Code Issues Projects Releases Wiki Activity

[git] Update to 2.14.3 (was 2.14.2.3)

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-10-27 18:53:36 -07:00
parent 39830efc4f
commit 0796a9df0e
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/bootstrap.ps1
View File

@ -13,7 +13,7 @@ $gitHash = "unknownhash"
$oldpath = $env:path $oldpath = $env:path
try try
{ {
$env:path += ";$vcpkgRootDir\downloads\MinGit-2.14.1-32-bit\cmd" $env:path += ";$vcpkgRootDir\downloads\MinGit-2.14.3-32-bit\cmd"
if (Get-Command "git" -ErrorAction SilentlyContinue) if (Get-Command "git" -ErrorAction SilentlyContinue)
{ {
$gitHash = git log HEAD -n 1 --format="%cd-%H" --date=short $gitHash = git log HEAD -n 1 --format="%cd-%H" --date=short

14
scripts/fetchDependency.ps1
View File

@ -172,16 +172,16 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
} }
elseif($Dependency -eq "git") elseif($Dependency -eq "git")
{ {
$requiredVersion = "2.14.2" $requiredVersion = "2.14.3"
$downloadVersion = "2.14.2" $downloadVersion = "2.14.3"
$url = "https://github.com/git-for-windows/git/releases/download/v2.14.2.windows.3/MinGit-2.14.2.3-32-bit.zip" # We choose the 32-bit version $url = "https://github.com/git-for-windows/git/releases/download/v2.14.3.windows.1/MinGit-2.14.3-32-bit.zip"
$downloadPath = "$downloadsDir\MinGit-2.14.2.3-32-bit.zip" $downloadPath = "$downloadsDir\MinGit-2.14.3-32-bit.zip"
$expectedDownloadedFileHash = "7cc1f27e1cfe79381e1a504a5fc7bc33951ac9031cd14c3bf478769d21a26cce" $expectedDownloadedFileHash = "a91385acb1da220612790807c41d0f304b41093c474b9d7342230ec194a3398e"
# There is another copy of git.exe in MinGit\bin. However, an installed version of git add the cmd dir to the PATH. # There is another copy of git.exe in MinGit\bin. However, an installed version of git add the cmd dir to the PATH.
# Therefore, choosing the cmd dir here as well. # Therefore, choosing the cmd dir here as well.
$executableFromDownload = "$downloadsDir\MinGit-2.14.2.3-32-bit\cmd\git.exe" $executableFromDownload = "$downloadsDir\MinGit-2.14.3-32-bit\cmd\git.exe"
$extractionType = $ExtractionType_ZIP $extractionType = $ExtractionType_ZIP
$extractionFolder = "$downloadsDir\MinGit-2.14.2.3-32-bit" $extractionFolder = "$downloadsDir\MinGit-2.14.3-32-bit"
} }
elseif($Dependency -eq "installerbase") elseif($Dependency -eq "installerbase")
{ {

4
toolsrc/src/vcpkg/vcpkgpaths.cpp
View File

@ -150,10 +150,10 @@ namespace vcpkg
fs::path get_git_path(const fs::path& downloads_folder, const fs::path& scripts_folder) fs::path get_git_path(const fs::path& downloads_folder, const fs::path& scripts_folder)
{ {
static constexpr std::array<int, 3> EXPECTED_VERSION = {2, 14, 2}; static constexpr std::array<int, 3> EXPECTED_VERSION = {2, 14, 3};
static const std::string VERSION_CHECK_ARGUMENTS = "--version"; static const std::string VERSION_CHECK_ARGUMENTS = "--version";
const fs::path downloaded_copy = downloads_folder / "MinGit-2.14.2.3-32-bit" / "cmd" / "git.exe"; const fs::path downloaded_copy = downloads_folder / "MinGit-2.14.3-32-bit" / "cmd" / "git.exe";
const std::vector<fs::path> from_path = Files::find_from_PATH("git"); const std::vector<fs::path> from_path = Files::find_from_PATH("git");
std::vector<fs::path> candidate_paths; std::vector<fs::path> candidate_paths;