jenkins-bot has submitted this change and it was merged.
Change subject: Checkout proper branch when using master
......................................................................
Checkout proper branch when using master
Change-Id: Ib0493b64b7d737a8a4f949756db3162afbd066a8
---
M multiversion/checkoutMediaWiki.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/multiversion/checkoutMediaWiki.php
b/multiversion/checkoutMediaWiki.php
index f1c78fe..d225ac4 100644
--- a/multiversion/checkoutMediaWiki.php
+++ b/multiversion/checkoutMediaWiki.php
@@ -59,7 +59,8 @@
print "Error running setting autosetuprebase\n";
}
- passthru( 'git checkout ' . escapeshellarg( "wmf/$gitVersion"
), $ret );
+ $checkoutVersion = $gitVersion == 'master' ? $gitVersion :
"wmf/$gitVersion";
+ passthru( 'git checkout ' . escapeshellarg( $checkoutVersion ),
$ret );
if ( $ret ) {
print "Error checking out branch\n";
exit( 1 );
--
To view, visit https://gerrit.wikimedia.org/r/200996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0493b64b7d737a8a4f949756db3162afbd066a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
