Skip to content
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

Jump to bottom

all: either enforce prefix for non-master branches with automation, or remove the requirement #34793

Closed
dmitshur opened this issue Oct 9, 2019 · 4 comments
Closed

all: either enforce prefix for non-master branches with automation, or remove the requirement #34793

dmitshur opened this issue Oct 9, 2019 · 4 comments
Labels
Builders x/build issues (builders, bots, dashboards) Community FrozenDueToAge NeedsDecision Feedback is required from experts, contributors, and/or the community before a change can be made.
Milestone
Unreleased

Comments

@dmitshur
Copy link
Contributor

dmitshur commented Oct 9, 2019 •
edited

The process for making changes to branches other than master is described at https://golang.org/wiki/MinorReleases#making-cherry-pick-cls. It requires adding a "[branch-name]" prefix to the commit message. However, it doesn't describe the motivation for doing so. I've asked around and so far no one knows.

We should find out why the convention exists and document the rationale for it (so that when time passes and people forget why we're doing it, it's possible to look it up and confirm the reason is still applicable).

If it turns out the reason for doing so is still valid, we should improve tooling to catch cherry-pick CLs that have the wrong prefix.

If it turns out there is no reason to add the prefix anymore, we should change the cherry-pick process to remove that requirement.

/cc @golang/osp-team

Possibly related issue #13202.
@dmitshur dmitshur added Builders x/build issues (builders, bots, dashboards) NeedsDecision Feedback is required from experts, contributors, and/or the community before a change can be made. Community labels Oct 9, 2019
@dmitshur dmitshur changed the title all: either enforce prefix for non-master branches with a bot, or remove the requirement all: either enforce prefix for non-master branches with automation, or remove the requirement Oct 9, 2019
@dmitshur dmitshur added this to the Unreleased milestone Oct 9, 2019
@FiloSottile
Copy link
Contributor

I am mildly in favor of keeping the prefix. It makes CLs easily distinguishable from their cherry-picks, for example. We should definitely have a bot check.

@bradfitz
Copy link
Contributor

bradfitz commented Oct 9, 2019

Russ is in favor of keeping them too. (Just discussed in unrelated meeting)

Once we have #18548 this is another easy check to add to that.

@katiehockman
Copy link
Contributor

Can we have Gerrit auto-fill that prefix when we use the UI to create the cherry pick?

@dmitshur
Copy link
Contributor Author

dmitshur commented Dec 22, 2020 •
edited

I think we've decided we want to keep this (it adds clarity when dealing with CLs from different branches), and so it should be automated.

I'll close this in favor of #41722 which is about implementing the automated check for mismatch.

@golang golang locked and limited conversation to collaborators Dec 22, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
Builders x/build issues (builders, bots, dashboards) Community FrozenDueToAge NeedsDecision Feedback is required from experts, contributors, and/or the community before a change can be made.
Projects
None yet
Milestone
Unreleased
Development

No branches or pull requests
5 participants
@bradfitz @FiloSottile @dmitshur @gopherbot @katiehockman