diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-06-07 02:28:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-07 02:28:58 +0200 |
| commit | 101e59361e3648468e900b04e0f8a94f628c4681 (patch) | |
| tree | 42345a9e533ddda1a6d2c64d0848528901f3e4d5 /src/rustllvm/RustWrapper.cpp | |
| parent | 6f8760bda39d66ceb9b98e4966a9f7b1e3000e66 (diff) | |
| parent | 37a24b34c74790ee593aaead775ad5f4d96dacd1 (diff) | |
| download | rust-101e59361e3648468e900b04e0f8a94f628c4681.tar.gz rust-101e59361e3648468e900b04e0f8a94f628c4681.zip | |
Rollup merge of #72993 - cuviper:beta-number, r=Mark-Simulacrum
Count the beta prerelease number just from master We were computing a merge-base between the remote beta and master branches, but this was giving incorrect answers for the first beta if the remote hadn't been pushed yet. For instance, `1.45.0-beta.3359` corresponds to the number of merges since the 1.44 beta, but we really want just `.1` for the sole 1.45 beta promotion merge. We don't really need to query the remote beta at all -- `master..HEAD` suffices if we assume that we're on the intended beta branch already.
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions