about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-12-23 00:07:38 +0800
committerkennytm <kennytm@gmail.com>2018-12-23 02:11:54 +0800
commit660eca64afcf92a8bca2de10400647107602eaba (patch)
tree9ff08b914e374cf1e9875cfc917cbccdbfe59a20
parent54d4e26b217d1e483b66f18713149bff97d9bd71 (diff)
parent6130fc884bc1dff9bb835894a7bb2042c110b011 (diff)
downloadrust-660eca64afcf92a8bca2de10400647107602eaba.tar.gz
rust-660eca64afcf92a8bca2de10400647107602eaba.zip
Rollup merge of #56933 - clarcharr:xpy_progress, r=Mark-Simulacrum
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.
-rw-r--r--src/bootstrap/bootstrap.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index d143dffb24b..09c87fdd1a8 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -678,10 +678,10 @@ class RustBuild(object):
 
         print("Updating submodule", module)
 
-        run(["git", "submodule", "-q", "sync", module],
+        run(["git", "submodule", "-q", "sync", "--progress", module],
             cwd=self.rust_root, verbose=self.verbose)
         run(["git", "submodule", "update",
-            "--init", "--recursive", module],
+            "--init", "--recursive", "--progress", module],
             cwd=self.rust_root, verbose=self.verbose)
         run(["git", "reset", "-q", "--hard"],
             cwd=module_path, verbose=self.verbose)