aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/VcpkgPaths.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-08-11 15:40:06 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-08-11 15:40:06 -0700
commit8a0a99b62a61b8efffd8a5e375900c4b572f5d3f (patch)
tree69a232907da11ddad549494a795191197cfaf003 /toolsrc/src/VcpkgPaths.cpp
parente4f553a5c8ed4207b36fdf0e85f1d06cb9b0d204 (diff)
downloadvcpkg-8a0a99b62a61b8efffd8a5e375900c4b572f5d3f.tar.gz
vcpkg-8a0a99b62a61b8efffd8a5e375900c4b572f5d3f.zip
Update required/downloaded git to 2.14.1
Diffstat (limited to 'toolsrc/src/VcpkgPaths.cpp')
-rw-r--r--toolsrc/src/VcpkgPaths.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/VcpkgPaths.cpp
index 38b11584a..f3513a3f3 100644
--- a/toolsrc/src/VcpkgPaths.cpp
+++ b/toolsrc/src/VcpkgPaths.cpp
@@ -143,10 +143,10 @@ namespace vcpkg
fs::path get_git_path(const fs::path& downloads_folder, const fs::path scripts_folder)
{
- static constexpr std::array<int, 3> expected_version = {2, 0, 0};
+ static constexpr std::array<int, 3> expected_version = {2, 14, 1};
static const std::wstring version_check_arguments = L"--version";
- const fs::path downloaded_copy = downloads_folder / "MinGit-2.11.1-32-bit" / "cmd" / "git.exe";
+ const fs::path downloaded_copy = downloads_folder / "MinGit-2.14.1-32-bit" / "cmd" / "git.exe";
const std::vector<fs::path> from_path = find_from_PATH(L"git");
std::vector<fs::path> candidate_paths;