jenkins-bot has submitted this change and it was merged.
Change subject: Move autosetuprebase to where it will actually do something
useful
......................................................................
Move autosetuprebase to where it will actually do something useful
Change-Id: Ie608974b10217ffb716349562805acdac2705232
---
M multiversion/checkoutMediaWiki
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/multiversion/checkoutMediaWiki b/multiversion/checkoutMediaWiki
index 3ec4d1b..ec679fe 100755
--- a/multiversion/checkoutMediaWiki
+++ b/multiversion/checkoutMediaWiki
@@ -53,6 +53,13 @@
print "Error changing directory\n";
exit( 1 );
}
+
+ passthru( 'git config branch.autosetuprebase always', $ret );
+ if ( $ret ) {
+ # Don't exit, this isn't a show-stopper
+ print "Error running setting autosetuprebase\n";
+ }
+
passthru( 'git checkout ' . escapeshellarg( "wmf/$gitVersion"
), $ret );
if ( $ret ) {
print "Error checking out branch\n";
@@ -62,12 +69,6 @@
if ( $ret ) {
print "Error updating submodules\n";
exit( 1 );
- }
-
- passthru( 'git config branch.autosetuprebase always', $ret );
- if ( $ret ) {
- # Don't exit, this isn't a show-stopper
- print "Error running setting autosetuprebase\n";
}
passthru( 'git config alias.up "pull --ff-only"', $ret );
--
To view, visit https://gerrit.wikimedia.org/r/94301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie608974b10217ffb716349562805acdac2705232
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
