3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 11:21:12 +08:00
Code Issues Projects Releases Wiki Activity

Update git to 2.16.2

Browse Source
This commit is contained in:
Alexander Karatarakis 2018-02-20 17:58:21 -08:00
parent adb0930bc5
commit 8a4afe1619
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/bootstrap.ps1
View File

@ -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

12
scripts/fetchDependency.ps1
View File

@ -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")

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

@ -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);