https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114827
Revision: 114827
Author: demon
Date: 2012-04-10 19:01:23 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Forgot the most important part of r114826, have to specify -b on `git submodule
add`
$duplication++
Modified Paths:
--------------
trunk/tools/make-wmf-branch/make-wmf-branch
Modified: trunk/tools/make-wmf-branch/make-wmf-branch
===================================================================
--- trunk/tools/make-wmf-branch/make-wmf-branch 2012-04-10 18:58:34 UTC (rev
114826)
+++ trunk/tools/make-wmf-branch/make-wmf-branch 2012-04-10 19:01:23 UTC (rev
114827)
@@ -145,8 +145,12 @@
# Add extension submodules
foreach ( array_merge( $this->normalExtensions,
$this->specialExtensions, $this->branchedExtensions ) as $name ) {
- $this->runWriteCmd( 'git', 'submodule', 'add', '-q',
- "{$this->baseRepoPath}/extensions/{$name}.git",
"extensions/$name" );
+ if( in_array( $name, $this->branchedExtensions ) ) {
+ $this->runWriteCmd( 'git', 'submodule', 'add',
'-b', $newVersion '-q',
+
"{$this->baseRepoPath}/extensions/{$name}.git", "extensions/$name" );
+ } else {
+ $this->runWriteCmd( 'git', 'submodule', 'add',
'-q',
+
"{$this->baseRepoPath}/extensions/{$name}.git", "extensions/$name" );
if( isset( $preservedRefs[$name] ) ) {
file_put_contents( "extensions/$name",
$preservedRefs[$name] );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
