diff options
| author | Taylor Yu <tlyu@mit.edu> | 2021-10-07 17:58:52 -0500 |
|---|---|---|
| committer | Taylor Yu <tlyu@mit.edu> | 2021-10-07 18:41:19 -0500 |
| commit | 6ff72045dee098e5a95f42c27b2f2cf167f0d52d (patch) | |
| tree | 59a686d6fadcde0134e37d1b7dac784af769842a /src/bootstrap | |
| parent | 5641481ad735c742cc669bb1e47f10116b789ee7 (diff) | |
| download | rust-6ff72045dee098e5a95f42c27b2f2cf167f0d52d.tar.gz rust-6ff72045dee098e5a95f42c27b2f2cf167f0d52d.zip | |
bootstrap: don't use `--merges` to find commits
Shallow clones can cause `git rev-list --merges` to miss merge commits. Omit it, because the most recent bors commit is almost always a merge commit.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bootstrap.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 05d7b0f611f..49121869282 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -460,7 +460,7 @@ class RustBuild(object): # LLVM more often than necessary. # # This git command finds that commit SHA, looking for bors-authored - # merges that modified src/llvm-project or other relevant version + # commits that modified src/llvm-project or other relevant version # stamp files. # # This works even in a repository that has not yet initialized @@ -470,7 +470,7 @@ class RustBuild(object): ]).decode(sys.getdefaultencoding()).strip() llvm_sha = subprocess.check_output([ "git", "rev-list", "--author=bors@rust-lang.org", "-n1", - "--merges", "--first-parent", "HEAD", + "--first-parent", "HEAD", "--", "{}/src/llvm-project".format(top_level), "{}/src/bootstrap/download-ci-llvm-stamp".format(top_level), @@ -685,7 +685,7 @@ class RustBuild(object): # Only commits merged by bors will have CI artifacts. merge_base = [ "git", "rev-list", "--author=bors@rust-lang.org", "-n1", - "--merges", "--first-parent", "HEAD" + "--first-parent", "HEAD" ] commit = subprocess.check_output(merge_base, universal_newlines=True).strip() |