[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Clean up branching logic to remove .git and /p/

[Chad (Code Review)]

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/326543 )

Change subject: Clean up branching logic to remove .git and /p/
......................................................................

Clean up branching logic to remove .git and /p/

This fixes submodule subscriptions because gerrit 2.13+ made some
dumb choices. smdh.

Change-Id: Ie8abee140ccf42b24b5200b23cb2753bb028386b
---
M make-wmf-branch/MakeWmfBranch.php
M make-wmf-branch/default.conf
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/43/326543/1

diff --git a/make-wmf-branch/MakeWmfBranch.php 
b/make-wmf-branch/MakeWmfBranch.php
index 2fe5118..c06d19c 100644
--- a/make-wmf-branch/MakeWmfBranch.php
+++ b/make-wmf-branch/MakeWmfBranch.php
@@ -174,7 +174,7 @@
                        return;
         }
 
-               $this->runCmd( 'git', 'clone', '-q', 
"{$this->repoPath}/{$path}.git", $repo );
+               $this->runCmd( 'git', 'clone', '-q', 
"{$this->repoPath}/{$path}", $repo );
                $this->chdir( $repo );
                $newVersion = $this->branchPrefix . $this->newVersion;
 
@@ -202,7 +202,7 @@
        function branchWmf( $clonePath ) {
                # Clone the repository
                $oldVersion = $this->oldVersion == 'master' ? 'master' : 
$this->branchPrefix . $this->oldVersion;
-               $path = $clonePath ? $clonePath : "{$this->repoPath}/core.git";
+               $path = $clonePath ? $clonePath : "{$this->repoPath}/core";
                $this->runCmd( 'git', 'clone', '-q', $path, '-b', $oldVersion, 
'wmf' );
 
                $this->chdir( 'wmf' );
@@ -233,18 +233,18 @@
          }
 
                        $this->runCmd( 'git', 'submodule', 'add', '-b', 
$submoduleBranch, '-q',
-                               "{$this->repoPath}/extensions/{$name}.git", 
"extensions/$name" );
+                               "{$this->repoPath}/extensions/{$name}", 
"extensions/$name" );
                }
 
                # Add skin submodules
                foreach ( $this->branchedSkins as $name ) {
                        $this->runCmd( 'git', 'submodule', 'add', '-f', '-b', 
$newVersion, '-q',
-                               "{$this->repoPath}/skins/{$name}.git", 
"skins/$name" );
+                               "{$this->repoPath}/skins/{$name}", 
"skins/$name" );
                }
 
                # Add vendor submodule
                $this->runCmd( 'git', 'submodule', 'add', '-f', '-b', 
$newVersion, '-q',
-                       "{$this->repoPath}/vendor.git", 'vendor' );
+                       "{$this->repoPath}/vendor", 'vendor' );
 
                # Fix $wgVersion
                $this->fixVersion( "includes/DefaultSettings.php" );
diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf
index 5edd418..7b0bb46 100644
--- a/make-wmf-branch/default.conf
+++ b/make-wmf-branch/default.conf
@@ -8,7 +8,7 @@
 # directory called local.conf
 
 # Repository paths.
-$repoPath = 'https://gerrit.wikimedia.org/r/p/mediawiki';
+$repoPath = 'https://gerrit.wikimedia.org/r/mediawiki';
 
 $branchPrefix = 'wmf/';
 

-- 
To view, visit https://gerrit.wikimedia.org/r/326543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8abee140ccf42b24b5200b23cb2753bb028386b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Chad <ch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits