Skip to content

Conversation

Kobzol
Copy link
Member

@Kobzol Kobzol commented Sep 4, 2025

@@ -193,9 +193,9 @@ fn checkout(artifact: &ArtifactId) -> anyhow::Result<()> {
.current_dir("rust")
.arg("fetch")
.arg("origin")
.arg("master")
.arg("HEAD")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this update the reference that bootstrap is reading? My memory is hazy (and I'm not sure how to test) but I think I've seen git not update e.g. origin/master for this kind of command...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It fetches and hard resets to a specific SHA anyway, so I think that it should be fine ( I don't know why we fetch HEAD at all).

Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feel free to merge if you're not worried about the origin thing, doesn't seem likely to instantly break though (so we might only find out we're testing the wrong thing in weeks).

@Kobzol
Copy link
Member Author

Kobzol commented Sep 5, 2025

Let's try it.

@Kobzol Kobzol merged commit 9184578 into rust-lang:master Sep 5, 2025
11 checks passed
@Kobzol Kobzol deleted the remove-master-dependency branch September 5, 2025 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants