Skip to content

Update GitHub doc to mention that we accepts user branches for Stacked PRs #73774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2023

Conversation

joker-eph
Copy link
Collaborator

This isn't yet a guide on how to do stacked PRs.

Copy link
Collaborator

@tstellar tstellar left a comment

Choose a reason for hiding this comment

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

Is there a local config we can use to tell git not to pull these branches? If so, it might be good to document that.

Copy link
Collaborator

@vitalybuka vitalybuka left a comment

Choose a reason for hiding this comment

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

I assume we going to have SPR setup somewhere.

Looks like everyone I asked to try SPR failed to realize
that branch destination is main repo and branchPrefix must be specific.

[spr]
	githubRemoteName = origin
	githubRepository = llvm/llvm-project
	githubMasterBranch = main
	branchPrefix = users/vitalybuka/spr/
	requireTestPlan = false

…d PR.

This isn't yet a guide on how to do stacked PRs.
@joker-eph
Copy link
Collaborator Author

I assume we going to have SPR setup somewhere.

Yes, that would be a separate doc in my mind.

Is there a local config we can use to tell git not to pull these branches? If so, it might be good to document that.

This is the "refspec": https://git-scm.com/book/en/v2/Git-Internals-The-Refspec

I spent quite some time on it today, but I can't find a command to specify it... You can add one during clone, but fetch = +refs/heads/*:refs/remotes/origin/* will always come by default and needs to be removed and replaced by fetch = +refs/heads/main:refs/remotes/origin/main

I added a sed in the getting started, WDYT?

@joker-eph
Copy link
Collaborator Author

@tstellar wanna double check?

Copy link
Collaborator

@tstellar tstellar left a comment

Choose a reason for hiding this comment

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

Looks good, thanks.

@joker-eph joker-eph merged commit 725a040 into llvm:main Dec 5, 2023
@joker-eph joker-eph deleted the github-docs branch December 5, 2023 02:26
MaskRay added a commit that referenced this pull request Dec 10, 2023
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.

3 participants