aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorCheney Wang <38240633+Cheney-W@users.noreply.github.com>2020-04-24 04:47:47 +0800
committerGitHub <noreply@github.com>2020-04-23 13:47:47 -0700
commitb6cd6ca0ba71667e46610e3ecdf5de0cef043ef5 (patch)
treefad43bc3d8cb4b0dc1135a08d50ee9a430f0a972 /scripts
parent6c13c24d44e94a1a5d63160a1a1359795381f00a (diff)
downloadvcpkg-b6cd6ca0ba71667e46610e3ecdf5de0cef043ef5.tar.gz
vcpkg-b6cd6ca0ba71667e46610e3ecdf5de0cef043ef5.zip
[vcpkg] Update git to 2.26.2 (#10932)
* Update git to 2.26.1 * [vcpkg] Update git to 2.26.2 Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/cmake/vcpkg_find_acquire_program.cmake8
-rw-r--r--scripts/vcpkgTools.xml8
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 6086525d1..e7a99cb55 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -90,10 +90,10 @@ function(vcpkg_find_acquire_program VAR)
elseif(VAR MATCHES "GIT")
set(PROGNAME git)
if(CMAKE_HOST_WIN32)
- set(SUBDIR "git-2.25.1-1-windows")
- set(URL "https://github.com/git-for-windows/git/releases/download/v2.25.1.windows.1/PortableGit-2.25.1-32-bit.7z.exe")
- set(ARCHIVE "PortableGit-2.25.1-32-bit.7z.exe")
- set(HASH 222d6e384ecae5841cb02dc004c4b3f56659d19b662bc93ab531df844c9477c9717c4a1adfb8bc2d3159678238fa4c79ccbdcb5c116eea5eccd652f4b483359e)
+ set(SUBDIR "git-2.26.2-1-windows")
+ set(URL "https://github.com/git-for-windows/git/releases/download/v2.26.2.windows.1/PortableGit-2.26.2-32-bit.7z.exe")
+ set(ARCHIVE "PortableGit-2.26.2-32-bit.7z.exe")
+ set(HASH d3cb60d62ca7b5d05ab7fbed0fa7567bec951984568a6c1646842a798c4aaff74bf534cf79414a6275c1927081a11b541d09931c017bf304579746e24fe57b36)
set(PATHS
"${DOWNLOADS}/tools/${SUBDIR}/mingw32/bin"
"${DOWNLOADS}/tools/git/${SUBDIR}/mingw32/bin")
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 27eb3e7e0..16d214920 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -29,11 +29,11 @@
<archiveName>cmake-3.12.4-FreeBSD-x86_64.tar.gz</archiveName>
</tool>
<tool name="git" os="windows">
- <version>2.25.1-1</version>
+ <version>2.26.2-1</version>
<exeRelativePath>mingw32\bin\git.exe</exeRelativePath>
- <url>https://github.com/git-for-windows/git/releases/download/v2.25.1.windows.1/PortableGit-2.25.1-32-bit.7z.exe</url>
- <sha512>222d6e384ecae5841cb02dc004c4b3f56659d19b662bc93ab531df844c9477c9717c4a1adfb8bc2d3159678238fa4c79ccbdcb5c116eea5eccd652f4b483359e</sha512>
- <archiveName>PortableGit-2.25.1-32-bit.7z.exe</archiveName>
+ <url>https://github.com/git-for-windows/git/releases/download/v2.26.2.windows.1/PortableGit-2.26.2-32-bit.7z.exe</url>
+ <sha512>d3cb60d62ca7b5d05ab7fbed0fa7567bec951984568a6c1646842a798c4aaff74bf534cf79414a6275c1927081a11b541d09931c017bf304579746e24fe57b36</sha512>
+ <archiveName>PortableGit-2.26.2-32-bit.7z.exe</archiveName>
</tool>
<tool name="git" os="linux">
<version>2.7.4</version>