Last modified: 2014-06-02 08:02:56 UTC
On Wed, Feb 19, 2014 at 1:24 PM, Antoine Musso <amusso@wikimedia.org> wrote: > Le 19/02/2014 20:07, Greg Grossmeier a écrit : > <snip> > > the patches are manually applied on the cluster > ^^^^^^^^ > > Here is the problem: "manually". > > We can commit the security patches in the extension submodules and > configure submodule update to always rebase. > > [submodule "extensions/WikiLove"] > path = extensions/WikiLove > url = .... gerrit ... > update = rebase > > The default is "checkout". > > > Ref: submodule.<name>.update in gitmodules(5) > > Holy crap that's amazing. How did I not know about this? *THIS* is what we need.
This needs to be done in the checkoutMediaWiki script so it does things right when creating local clones :)
Change 131500 had a related patch set uploaded by BryanDavis: Configure git submodules to rebase on update https://gerrit.wikimedia.org/r/131500
Change 131500 merged by jenkins-bot: Configure git submodules to rebase on update https://gerrit.wikimedia.org/r/131500
Chad will test this in the 1.24wmf4 deploy.
From tin:/a/common/php-1.24wmf5/.git : [branch "wmf/1.24wmf5"] remote = origin merge = refs/heads/wmf/1.24wmf5 rebase = true [submodule "extensions/AbuseFilter"] url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AbuseFilter.git update = rebase [submodule "extensions/AccountAudit"] url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/AccountAudit.git update = rebase
Well done guys!
