Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/71801
Change subject: I'm lazy and don't like typing
......................................................................
I'm lazy and don't like typing
Change-Id: I76c14e5d35261758aee1b9317935a712848a31e1
---
M multiversion/checkoutMediaWiki
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/01/71801/1
diff --git a/multiversion/checkoutMediaWiki b/multiversion/checkoutMediaWiki
index ea075bc..9c28234 100755
--- a/multiversion/checkoutMediaWiki
+++ b/multiversion/checkoutMediaWiki
@@ -69,6 +69,12 @@
# Don't exit, this isn't a show-stopper
print "Error running setting autosetuprebase\n";
}
+
+ passthru( 'git config alias.up "pull --ff-only"', $ret );
+ if( $res ) {
+ # Don't exit, no big deal
+ print "Error configuring 'up' alias\n";
+ }
} else {
echo "MediaWiki already checked out at $destIP\n";
}
--
To view, visit https://gerrit.wikimedia.org/r/71801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76c14e5d35261758aee1b9317935a712848a31e1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Demon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
