diff options
| author | bors <bors@rust-lang.org> | 2021-07-28 16:59:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-28 16:59:00 +0000 |
| commit | a28109a7679fbb254ca0962865a8b32b91ddbbd9 (patch) | |
| tree | 288a796a8f64971fc536e644ffa067e421373c8d /src/bootstrap/bootstrap.py | |
| parent | eba3228b2a9875d268ff3990903d04e19f6cdb0c (diff) | |
| parent | 7985e4c7c3fb9c1a4f09f1c24949f21e65ceee37 (diff) | |
| download | rust-a28109a7679fbb254ca0962865a8b32b91ddbbd9.tar.gz rust-a28109a7679fbb254ca0962865a8b32b91ddbbd9.zip | |
Auto merge of #87540 - JohnTitor:rollup-8xc6bl5, r=JohnTitor
Rollup of 10 pull requests Successful merges: - #87315 (Add docs for raw-dylib to unstable book) - #87330 (Use hashbrown's `extend_reserve()` in `HashMap`) - #87443 (Don't treat git repos as non-existent when `ignore_git` is set) - #87453 (Suggest removing unnecessary &mut as help message) - #87500 (Document math behind MIN/MAX consts on integers) - #87501 (Remove min_type_alias_impl_trait in favor of type_alias_impl_trait) - #87507 (SGX mutex is *not* moveable) - #87513 (bootstrap.py: change `git log` option to indicate desired behavior) - #87523 (Stop creating a reference then immediately dereferencing it.) - #87524 (Fix ICE in `diagnostic_hir_wf_check`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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 d2cf929aa26..f2e38a7eab6 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -473,7 +473,7 @@ class RustBuild(object): ]).decode(sys.getdefaultencoding()).strip() llvm_sha = subprocess.check_output([ "git", "log", "--author=bors", "--format=%H", "-n1", - "-m", "--first-parent", + "--no-patch", "--first-parent", "--", "{}/src/llvm-project".format(top_level), "{}/src/bootstrap/download-ci-llvm-stamp".format(top_level), |