Trevor Gross ef96679505 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.		2024-10-12 21:38:36 -05:00
..
ISSUE_TEMPLATE	remove blank issue template	2024-10-04 09:38:14 +02:00
workflows	add new CI step: "setup upstream remote"	2024-10-12 08:58:39 +03:00
pull_request_template.md