Fetch origin HEAD on checkout #1684
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This ensures that git merge-base can find the right merge point; otherwise, our history looks to have diverged when the original checkout was made, which might be years ago.
|
Before we merge we should do some testing to try to figure out the right incantation. I think HEAD might do the wrong thing here, we might need |
|
Oh so this has an Just not having that branch is the other alternative, then my PR will fall back to the old logic. |
|
@Mark-Simulacrum @lqd what is the status of this? I just ran into rust-lang/rust#101907 again... |
RalfJung
reviewed
Aug 21, 2023
Mark-Simulacrum
commented
Aug 31, 2023
lqd
approved these changes
Aug 31, 2023
Co-authored-by: Rémy Rakic <[email protected]>
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 2, 2023
bootstrap: use git merge-base for LLVM CI download logic This re-lands rust-lang#113588, now that the perf issues are hopefully fixed by rust-lang/rustc-perf#1684. r? `@lqd` `@Mark-Simulacrum` Fixes rust-lang#101907
RalfJung
pushed a commit
to RalfJung/miri
that referenced
this pull request
Sep 3, 2023
bootstrap: use git merge-base for LLVM CI download logic This re-lands rust-lang/rust#113588, now that the perf issues are hopefully fixed by rust-lang/rustc-perf#1684. r? `@lqd` `@Mark-Simulacrum` Fixes rust-lang/rust#101907
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This ensures that git merge-base can find the right merge point; otherwise, our history looks to have diverged when the original checkout was made, which might be years ago.
cc @RalfJung rust-lang/rust#101907