Page MenuHomePhabricator
Create Task
Maniphest T189024

In Gerrit set receive.rejectImplicitMerges = True in All-Projects
Closed, ResolvedPublic
Actions

Description

https://gerrit.wikimedia.org/r/#/c/416675/ was a commit from master sent for review to the the wmf branch. Since all ancestors were merged in master, Gerrit kindly assumes that is a merge attempt (of master to wmf) and that is not reflected in the GUI.

When the change got submitted, the master branch ended up being implicitly merged in the wmf branch.

https://wikitech.wikimedia.org/wiki/Incident_documentation/20180306-MasterMergedInWMFBranch

Gerrit 2.13 offers the option receive.rejectImplicitMerges to prevent that implict merge. From Gerrit 2.13 release notes:

''The ‘Reject Implicit Merges’ option can be enabled to prevent non-merge commits from implicitly bringing unwanted changes into a branch. This can happen for example when a commit is made based on one branch but is mistakenly pushed to another, for example based on refs/heads/master but pushed to refs/for/stable.''

At https://gerrit.wikimedia.org/r/#/admin/projects/All-Projects we should set receive.rejectImplicitMerges = TRUE.

Details

SubjectRepoBranchLines +/-
Set receive.rejectImplicitMerges to true in project.configAll-Projectsrefs/meta/config+1 -0
Customize query in gerrit

Event Timeline

hashar created this task.Mar 6 2018, 3:45 PM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptMar 6 2018, 3:45 PM
Paladox subscribed.Mar 6 2018, 3:48 PM

Can this be set in project.config though?

Looking at the name of it, it seems it is a gerrit.config variable.

hashar added a subscriber: • demon.Mar 6 2018, 3:48 PM

That is to set receive.rejectImplicitMerges in Gerrit to prevent it from magically merging the master branch into a wmf branch. Typically happens one do a git push refs/publish/wmf from a local master branch.

I don't think there is any good use case for it.

Paladox added a comment.Mar 6 2018, 3:52 PM

Ah found it https://gerrit-review.googlesource.com/#/c/gerrit/+/85854/1/project.config

gerritbot subscribed.Mar 6 2018, 3:53 PM

Change 416704 had a related patch set uploaded (by Paladox; owner: Paladox):
[All-Projects@refs/meta/config] Set receive.rejectImplicitMerges to true in project.config

https://gerrit.wikimedia.org/r/416704

gerritbot added a project: Patch-For-Review.Mar 6 2018, 3:53 PM
hashar added a project: Release-Engineering-Team (Kanban).Mar 6 2018, 3:56 PM
hashar moved this task from Backlog to In-progress on the Release-Engineering-Team (Kanban) board.
Jdforrester-WMF subscribed.Mar 6 2018, 5:39 PM
gerritbot added a comment.Mar 6 2018, 7:45 PM

Change 416704 merged by Chad:
[All-Projects@refs/meta/config] Set receive.rejectImplicitMerges to true in project.config

https://gerrit.wikimedia.org/r/416704

hashar closed this task as Resolved.Mar 7 2018, 10:19 AM
hashar claimed this task.

mediawiki/core now has:

Reject implicit merges when changes are pushed for review: INHERIT (true)

https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/core

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits