diff options
| author | bors <bors@rust-lang.org> | 2018-12-24 20:46:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-24 20:46:10 +0000 |
| commit | f960f377fde2a01f64ec6f747725ce41147f46de (patch) | |
| tree | 4237233121adb47eea7b7697fb399ec2250b86ac /src/bootstrap/bootstrap.py | |
| parent | 37551e9396b3134ed49ceb8791ab76948bf5db33 (diff) | |
| parent | 49eb1e54199fa8529ff7c13bf6dd6a772b63c63f (diff) | |
| download | rust-f960f377fde2a01f64ec6f747725ce41147f46de.tar.gz rust-f960f377fde2a01f64ec6f747725ce41147f46de.zip | |
Auto merge of #57082 - matthiaskrgr:revert_56933, r=pietroalbini
x.py: fixup 6130fc884bc1dff9bb835894a7bb2042c110b011, fix submodule handling ./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
Diffstat (limited to 'src/bootstrap/bootstrap.py')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 09c87fdd1a8..958cc665f9e 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -678,7 +678,7 @@ class RustBuild(object): 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], |