Reedy has submitted this change and it was merged.
Change subject: Set branch.autosetuprebase to always when setting up new
deployment
......................................................................
Set branch.autosetuprebase to always when setting up new deployment
People like doing `git pull` because it's easy to type, but this
creates opaque merge commits when there's livehacks. This will
make git pull do a rebase by default when pulling.
While we're here, say something more helpful than "Error running git"
Change-Id: Idf23df01d03e057588fd9c5db3edc3df9ff2bbff
---
M multiversion/checkoutMediaWiki
1 file changed, 9 insertions(+), 3 deletions(-)
Approvals:
Reedy: Verified; Looks good to me, approved
diff --git a/multiversion/checkoutMediaWiki b/multiversion/checkoutMediaWiki
index b0d2586..6d616f4 100755
--- a/multiversion/checkoutMediaWiki
+++ b/multiversion/checkoutMediaWiki
@@ -45,7 +45,7 @@
escapeshellarg( $destIP ),
$ret );
if ( $ret ) {
- print "Error running git\n";
+ print "Error cloning mediawiki\n";
exit( 1 );
}
if ( !chdir( $destIP ) ) {
@@ -54,14 +54,20 @@
}
passthru( 'git checkout ' . escapeshellarg( "wmf/$gitVersion"
), $ret );
if ( $ret ) {
- print "Error running git\n";
+ print "Error checking out branch\n";
exit( 1 );
}
passthru( 'git submodule update --init --recursive', $ret );
if ( $ret ) {
- print "Error running git\n";
+ 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";
+ }
} else {
echo "MediaWiki already checked out at $destIP\n";
}
--
To view, visit https://gerrit.wikimedia.org/r/58236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf23df01d03e057588fd9c5db3edc3df9ff2bbff
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Demon <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
