diff options
| author | onur-ozkan <work@onurozkan.dev> | 2024-10-10 09:38:57 +0300 |
|---|---|---|
| committer | onur-ozkan <work@onurozkan.dev> | 2024-10-12 07:45:24 +0300 |
| commit | 33ac202904e7820268b71b3280a7d2590378e3b9 (patch) | |
| tree | e3440d7b32b1793b5983e8a2ab43be5ad8014c36 /compiler/rustc_codegen_llvm/src/errors.rs | |
| parent | 11ee3a830b8537976d54805331cc626604afbb63 (diff) | |
| download | rust-33ac202904e7820268b71b3280a7d2590378e3b9.tar.gz rust-33ac202904e7820268b71b3280a7d2590378e3b9.zip | |
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. Signed-off-by: onur-ozkan <work@onurozkan.dev>
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/errors.rs')
0 files changed, 0 insertions, 0 deletions