diff options
| author | bors <bors@rust-lang.org> | 2025-03-24 07:25:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-24 07:25:53 +0000 |
| commit | b95aac6a98e43ee9d47cd05cb2d476610c51dcb7 (patch) | |
| tree | 72fb4faf2fe2655ddd442b959c8aa6ce203bebef /compiler/rustc_middle/src | |
| parent | ae8ab87de4d8caab5d91a027bc19bb5d5e8a3691 (diff) | |
| parent | c71569a765fdd9364ea215ae01442a026e127ab9 (diff) | |
| download | rust-b95aac6a98e43ee9d47cd05cb2d476610c51dcb7.tar.gz rust-b95aac6a98e43ee9d47cd05cb2d476610c51dcb7.zip | |
Auto merge of #138878 - jieyouxu:revert-ci-llvm, r=dianqk
Revert "fix download-llvm logic for subtree sync branches #137593" Reverts #137593. Looks like unfortunately the `--diff-merges=first-parent` flag is a `git show`-only flag, not `git rev-list` which only accepts `--first-parent`. See https://git-scm.com/docs/git-rev-list#Documentation/git-rev-list.txt---first-parent which has `--first-parent`, versus https://git-scm.com/docs/git-show#Documentation/git-show.txt---diff-mergesltformatgt which has `--diff-merges=first-parent`. This reverts commit 95994f94ff5c9335426af4dec19afb5024f82fab, reversing changes made to 7290b04b0a46de2118968aa556bfc0970aac6661. This will unfortunately re-open https://github.com/rust-lang/rust/issues/101907 but that isn't fixed anyway since the git invocation is broken. cc `@RalfJung` `@Mark-Simulacrum` for FYI (but I would've written the same incorrect flag 💀) r? `@onur-ozkan` (or bootstrap or infra or anyone really)
Diffstat (limited to 'compiler/rustc_middle/src')
0 files changed, 0 insertions, 0 deletions