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

[git-webkit] Don't annotate cherry-picks from non-production branches #13970

Conversation

JonWBedard
Copy link
Member

@JonWBedard JonWBedard commented May 17, 2023

@JonWBedard JonWBedard self-assigned this May 17, 2023
@JonWBedard JonWBedard added the Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases label May 17, 2023
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 18, 2023
@JonWBedard JonWBedard removed the merging-blocked Applied to prevent a change from being merged label May 18, 2023
@JonWBedard JonWBedard force-pushed the eng/git-webkit-Dont-annotate-cherry-picks-from-non-production-branches branch from 27adfa3 to 5765ad8 Compare July 7, 2023 21:07
@JonWBedard JonWBedard added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jul 10, 2023
https://bugs.webkit.org/show_bug.cgi?id=256905
rdar://109466659

Reviewed by Elliott Williams.

Check if a cherry-pick is coming from a branch that exists on a source
remote. If so, the original commit is a persisent part of the repository
and we should annotate the commit message of the cherry-pick.

* Tools/Scripts/hooks/prepare-commit-msg:

Canonical link: https://commits.webkit.org/265920@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/git-webkit-Dont-annotate-cherry-picks-from-non-production-branches branch from 5765ad8 to 79ba0fe Compare July 10, 2023 22:02
@webkit-commit-queue
Copy link
Collaborator

Committed 265920@main (79ba0fe): https://commits.webkit.org/265920@main

Reviewed commits have been landed. Closing PR #13970 and removing active labels.

@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jul 10, 2023
@webkit-commit-queue webkit-commit-queue merged commit 79ba0fe into WebKit:main Jul 10, 2023
@JonWBedard JonWBedard deleted the eng/git-webkit-Dont-annotate-cherry-picks-from-non-production-branches branch July 11, 2023 03:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases
Projects
None yet
5 participants