diff options
| author | Trevor Gross <t.gross35@gmail.com> | 2024-10-12 21:38:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-12 21:38:36 -0500 |
| commit | ef96679505affb8c3df512e9462ec223f9939c96 (patch) | |
| tree | 76c69f527b72cb515d46940a7f7482219fde1dfc /compiler/rustc_codegen_llvm/src | |
| parent | d576cdda7efb7669dd26bd8a93eb78d69417686d (diff) | |
| parent | 4454fa998c9da1f1eee1602c8e8cd2732505c104 (diff) | |
| download | rust-ef96679505affb8c3df512e9462ec223f9939c96.tar.gz rust-ef96679505affb8c3df512e9462ec223f9939c96.zip | |
Rollup merge of #131358 - onur-ozkan:129528, r=Mark-Simulacrum
force "HEAD" for non-CI and `git_upstream_merge_base` for CI environment When rust-lang/rust is configured as remote, some of the git logic (for tracking changed files) that uses get_closest_merge_commit starts to produce annoying results as the upstream branch becomes outdated quickly (since it isn't updated with git pull). We can rely on HEAD for non-CI environments as we specifically treat bors commits as merge commits, which also exist on upstream. As for CI environments, we should use `git_upstream_merge_base` to correctly track modified files as bors commits may be in `HEAD` but not yet on the upstream remote. This is also an alternative fix for https://github.com/rust-lang/rust/issues/129528 since https://github.com/rust-lang/rust/pull/131331 reverts the previous fix attempts.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
0 files changed, 0 insertions, 0 deletions