20after4 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192866
Change subject: Revert "Track branch for special extensions" because:
--set-upstream-to doesn't work on git 1.7.9.5 which is what we are running on
tin.
......................................................................
Revert "Track branch for special extensions" because:
--set-upstream-to doesn't work on git 1.7.9.5 which is what
we are running on tin.
This reverts commit ec04d2144c8fa9cf20ab32dc9812896360e4c732.
Change-Id: Ic4e9928bccd6b0808aa8339be4c9a024051ed2d6
---
M make-wmf-branch/MakeWmfBranch.php
1 file changed, 0 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/66/192866/1
diff --git a/make-wmf-branch/MakeWmfBranch.php
b/make-wmf-branch/MakeWmfBranch.php
index 84c17f9..a45db89 100644
--- a/make-wmf-branch/MakeWmfBranch.php
+++ b/make-wmf-branch/MakeWmfBranch.php
@@ -171,16 +171,10 @@
$this->runCmd( 'git', 'submodule', 'add', '-q',
"{$this->anonRepoPath}/extensions/{$name}.git", "extensions/$name" );
}
-
if( isset( $preservedRefs[$name] ) ) {
$this->chdir( "extensions/$name" );
$this->runCmd( 'git', 'remote', 'update' );
$this->runCmd( 'git', 'checkout', '-q',
$preservedRefs[$name] );
-
- if ( $this->branchExists( $preservedRefs[$name]
) ) {
- $this->runCmd( 'git', 'branch', '-u',
'origin/' . $preservedRefs[$name] );
- }
-
$this->chdir( "../.." );
}
}
@@ -212,17 +206,6 @@
}
$this->runWriteCmd( 'git', 'push', 'origin', 'wmf/' .
$this->newVersion );
- }
-
- function branchExists( $branchName ) {
- if ( !is_string( $branchName ) ) {
- return false;
- }
-
- $remoteBranch = "origin/$branchName";
- exec( 'git branch --list -r ' . escapeshellarg( $remoteBranch
), $output, $res );
-
- return isset( $output[0] ) && strpos( $output[0], $remoteBranch
);
}
function fixVersion( $fileName ) {
--
To view, visit https://gerrit.wikimedia.org/r/192866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4e9928bccd6b0808aa8339be4c9a024051ed2d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: 20after4 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
