From 78a6bf63710df0fefc27b268bc63a03ac37d9220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Marchand?= Date: Thu, 16 Jul 2020 14:26:25 +0000 Subject: [PATCH] Revert "Roll git to 2.27.0 on Windows" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5fcb48536cceaa77db9af14cd00e049e3a74b9b9. Reason for revert: Broke Git on my gWindows machine, it fails for many Git operations with the following error message: git pull 2 [main] sh (54140) shared_info::initialize: size of shared memory region changed from 45944 to 38776 fatal: Could not read from remote repository I've confirmed that reverting this CL fixes the problem. Original change's description: > Roll git to 2.27.0 on Windows > > Bug: 1070694 > Change-Id: I37af08864661ca92116776569b9285ceb6ff465c > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2300204 > Reviewed-by: Josip Sokcevic > Commit-Queue: Edward Lesmes TBR=ehmaldonado@chromium.org,apolito@google.com,infra-scoped@luci-project-accounts.iam.gserviceaccount.com,sokcevic@google.com Change-Id: I4d27eaa1b17cb056635dceed5ad1562debfc2e06 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1070694 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2302489 Reviewed-by: Sébastien Marchand Commit-Queue: Sébastien Marchand --- bootstrap/manifest.txt | 2 +- bootstrap/manifest_bleeding_edge.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap/manifest.txt b/bootstrap/manifest.txt index 7aba87db5a..9266fcc581 100644 --- a/bootstrap/manifest.txt +++ b/bootstrap/manifest.txt @@ -24,4 +24,4 @@ infra/3pp/tools/cpython/${platform} version:2.7.17.chromium.22 infra/3pp/tools/cpython3/${os}-${arch} version:3.8.0.chromium.8 @Subdir git -infra/3pp/tools/git/${os}-${arch} version:2.27.0.chromium.6 +infra/3pp/tools/git/${os}-${arch} version:2.24.1.chromium.5 diff --git a/bootstrap/manifest_bleeding_edge.txt b/bootstrap/manifest_bleeding_edge.txt index f0657901eb..c9a34da86e 100644 --- a/bootstrap/manifest_bleeding_edge.txt +++ b/bootstrap/manifest_bleeding_edge.txt @@ -24,4 +24,4 @@ infra/3pp/tools/cpython/${platform} version:2.7.17.chromium.22 infra/3pp/tools/cpython3/${os}-${arch=amd64} version:3.8.0.chromium.8 @Subdir git -infra/3pp/tools/git/${os}-${arch} version:2.27.0.chromium.6 +infra/3pp/tools/git/${os}-${arch} version:2.24.1.chromium.5