From 49eb1e54199fa8529ff7c13bf6dd6a772b63c63f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Mon, 24 Dec 2018 20:19:49 +0100 Subject: [PATCH] x.py: fixup 6130fc884bc1dff9bb835894a7bb2042c110b011 ./x.py used to automatically check out the right commit when a submodule was outdated and ./x.py build was run and submodules handling was enabled in config.toml (submodules = true). But it threw an error: [...] failed to run: git submodule -q sync --progress src/tools/clippy The commit removes the --progress from git submodule call. Fixes #57080 --- src/bootstrap/bootstrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 09c87fdd1a84c..958cc665f9e0f 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -678,7 +678,7 @@ def update_submodule(self, module, checked_out, recorded_submodules): print("Updating submodule", module) - run(["git", "submodule", "-q", "sync", "--progress", module], + run(["git", "submodule", "-q", "sync", module], cwd=self.rust_root, verbose=self.verbose) run(["git", "submodule", "update", "--init", "--recursive", "--progress", module],