nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-31 06:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #56933 - clarcharr:xpy_progress, r=Mark-Simulacrum

Browse Source 
Add --progress to git submodule commands in x.py

This is a relatively new flag, but it means that git will indicate the progress of the update as it would with regular clones. This is especially helpful as some of the submodules are really big and it's difficult to tell if it's hanging or still updating.
This commit is contained in:
kennytm 2018-12-23 00:07:38 +08:00
commit 660eca64af
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bootstrap/bootstrap.py
View File

@ -678,10 +678,10 @@ class RustBuild(object):
print("Updating submodule", module) print("Updating submodule", module)
run(["git", "submodule", "-q", "sync", module], run(["git", "submodule", "-q", "sync", "--progress", module],
cwd=self.rust_root, verbose=self.verbose) cwd=self.rust_root, verbose=self.verbose)
run(["git", "submodule", "update", run(["git", "submodule", "update",
"--init", "--recursive", module], "--init", "--recursive", "--progress", module],
cwd=self.rust_root, verbose=self.verbose) cwd=self.rust_root, verbose=self.verbose)
run(["git", "reset", "-q", "--hard"], run(["git", "reset", "-q", "--hard"],
cwd=module_path, verbose=self.verbose) cwd=module_path, verbose=self.verbose)