set submodule.<name>.update to 'rebase'
Closed, ResolvedPublic
Actions

Assigned To

None

Authored By

	greg
	Feb 19 2014, 10:26 PM

Description

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.

Version: wmf-deployment
Severity: normal

Details

Reference: bz61562

Event Timeline

• bzimport raised the priority of this task from to Medium.Nov 22 2014, 3:06 AM

• bzimport added a project: Deployments.

• bzimport set Reference to bz61562.

• bzimport added a subscriber: Unknown Object (MLST).

greg created this task.Feb 19 2014, 10:26 PM

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!

greg moved this task from To Triage to Done on the Deployments board.Jan 8 2015, 5:39 PM

set submodule.<name>.update to 'rebase'Closed, ResolvedPublicActions

Description

Details

Event Timeline

set submodule.<name>.update to 'rebase'
Closed, ResolvedPublic
Actions