Skip to content

Commit f960f37

Browse files
committed
Auto merge of #57082 - matthiaskrgr:revert_56933, r=pietroalbini
x.py: fixup 6130fc8, 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
2 parents 37551e9 + 49eb1e5 commit f960f37

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/bootstrap/bootstrap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ def update_submodule(self, module, checked_out, recorded_submodules):
678678

679679
print("Updating submodule", module)
680680

681-
run(["git", "submodule", "-q", "sync", "--progress", module],
681+
run(["git", "submodule", "-q", "sync", module],
682682
cwd=self.rust_root, verbose=self.verbose)
683683
run(["git", "submodule", "update",
684684
"--init", "--recursive", "--progress", module],

0 commit comments

Comments
 (0)