about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/bootstrap/test.rs2
m---------src/tools/cargo0
m---------src/tools/rls0
3 files changed, 0 insertions, 2 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 5c8034d53e3..05403cf48c7 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -289,8 +289,6 @@ impl Step for Cargo {
         // Don't run cross-compile tests, we may not have cross-compiled libstd libs
         // available.
         cargo.env("CFG_DISABLE_CROSS_TESTS", "1");
-        // Disable a test that has issues with mingw.
-        cargo.env("CARGO_TEST_DISABLE_GIT_CLI", "1");
         // Forcibly disable tests using nightly features since any changes to
         // those features won't be able to land.
         cargo.env("CARGO_TEST_DISABLE_NIGHTLY", "1");
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 85b500ccad8cd0b63995fd94a03ddd4b83f7905
+Subproject 4fd148c47e733770c537efac5220744945d572e
diff --git a/src/tools/rls b/src/tools/rls
-Subproject fcf1f94c9ab2acc18cfd4368a4aeb38e77da964
+Subproject 4d8b0a19986a4daab37287a5b5fe2da0775d187