diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-02-20 17:58:21 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-02-20 18:09:51 -0800 |
| commit | 8a4afe16193f274eb4d60357d81b8827ed055fb8 (patch) | |
| tree | 482e5f2b5259edafbfc2831ce3bc3156bab84413 | |
| parent | adb0930bc54dbff26acf131971199c3f57bdd0fb (diff) | |
| download | vcpkg-8a4afe16193f274eb4d60357d81b8827ed055fb8.tar.gz vcpkg-8a4afe16193f274eb4d60357d81b8827ed055fb8.zip | |
Update git to 2.16.2
| -rw-r--r-- | scripts/bootstrap.ps1 | 2 | ||||
| -rw-r--r-- | scripts/fetchDependency.ps1 | 12 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/vcpkgpaths.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 0df2a2a99..eb4513a64 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -14,7 +14,7 @@ $gitHash = "unknownhash" $oldpath = $env:path try { - $env:path += ";$vcpkgRootDir\downloads\MinGit-2.15.0-32-bit\cmd" + $env:path += ";$vcpkgRootDir\downloads\MinGit-2.16.2-32-bit\cmd" if (Get-Command "git" -ErrorAction SilentlyContinue) { $gitHash = git log HEAD -n 1 --format="%cd-%H" --date=short diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1 index bfc0f733a..ec3cdc83a 100644 --- a/scripts/fetchDependency.ps1 +++ b/scripts/fetchDependency.ps1 @@ -50,14 +50,14 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency) } elseif($Dependency -eq "git") { - $requiredVersion = "2.15.0" - $downloadVersion = "2.15.0" - $url = "https://github.com/git-for-windows/git/releases/download/v2.15.0.windows.1/MinGit-2.15.0-32-bit.zip" - $downloadPath = "$downloadsDir\MinGit-2.15.0-32-bit.zip" - $expectedDownloadedFileHash = "69c035ab7b75c42ce5dd99e8927d2624ab618fab73c5ad84c9412bd74c343537" + $requiredVersion = "2.16.2" + $downloadVersion = "2.16.2" + $url = "https://github.com/git-for-windows/git/releases/download/v2.16.2.windows.1/MinGit-2.16.2-32-bit.zip" + $downloadPath = "$downloadsDir\MinGit-2.16.2-32-bit.zip" + $expectedDownloadedFileHash = "322c727e482aa97522c64a5ac68bdda3780111e8670bcfb532beac8e11ece5da" # 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. - $executableFromDownload = "$downloadsDir\MinGit-2.15.0-32-bit\cmd\git.exe" + $executableFromDownload = "$downloadsDir\MinGit-2.16.2-32-bit\cmd\git.exe" $extractionType = $ExtractionType_ZIP } elseif($Dependency -eq "installerbase") diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 06e0c01ab..d574b7c4d 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -167,7 +167,7 @@ namespace vcpkg fs::path get_git_path(const fs::path& downloads_folder, const fs::path& scripts_folder) { #if defined(_WIN32) - static constexpr std::array<int, 3> EXPECTED_VERSION = {2, 15, 0}; + static constexpr std::array<int, 3> EXPECTED_VERSION = {2, 16, 2}; #else static constexpr std::array<int, 3> EXPECTED_VERSION = {2, 7, 4}; #endif @@ -175,7 +175,7 @@ namespace vcpkg const std::vector<fs::path> from_path = Files::find_from_PATH("git"); - const fs::path downloaded_copy = downloads_folder / "MinGit-2.15.0-32-bit" / "cmd" / "git.exe"; + const fs::path downloaded_copy = downloads_folder / "MinGit-2.16.2-32-bit" / "cmd" / "git.exe"; std::vector<fs::path> candidate_paths; #if defined(_WIN32) candidate_paths.push_back(downloaded_copy); |