Skip to content

Commit

Permalink
Auto merge of #57082 - matthiaskrgr:revert_56933, r=pietroalbini
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Dec 24, 2018
2 parents 37551e9 + 49eb1e5 commit f960f37
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down

0 comments on commit f960f37

Please sign in to comment.