[Openstack-stable-maint] Possibility of accidental merge commits in stable backports

Jeremy Stanley fungi at yuggoth.org
Sat Sep 20 14:14:20 UTC 2014


Just wanted to provide a heads up that this Gerrit bug was brought
to the attention of the Infra team yesterday:

http://code.google.com/p/gerrit/issues/detail?id=1107

In short, be on the lookout for any backport change which is
actually the same Git SHA as on the master branch (probably the most
obvious sign will be lack of a cherry-pick header in the commit
message, since changes to the commit message also change the Git
SHA). Currently Gerrit won't protect us from someone proposing a
change from one branch to another if the parent commit of that
change is already in the former branch, even though it's not (yet)
in the latter.
-- 
Jeremy Stanley



More information about the Openstack-stable-maint mailing list