jenkins-bot has submitted this change and it was merged.

Change subject: Remove a me-only hack from git repos in prod
......................................................................


Remove a me-only hack from git repos in prod

Change-Id: I44c36616015276313c9c52091f08795181fd32e6
---
M multiversion/checkoutMediaWiki.php
1 file changed, 0 insertions(+), 6 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/multiversion/checkoutMediaWiki.php 
b/multiversion/checkoutMediaWiki.php
index 7d84a30..f1c78fe 100644
--- a/multiversion/checkoutMediaWiki.php
+++ b/multiversion/checkoutMediaWiki.php
@@ -82,12 +82,6 @@
                                }
                        }
                }
-
-               passthru( 'git config alias.up "pull --ff-only"', $ret );
-               if( $ret ) {
-                       # 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/200938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I44c36616015276313c9c52091f08795181fd32e6
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

Reply via email to