Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/174804
Change subject: s/git pull/git pull --rebase/g ...................................................................... s/git pull/git pull --rebase/g Because no one should be using 'git pull'. https://wikitech.wikimedia.org/wiki/Help:Git_rebase This needs testing -- I'm hoping that someone who uses this function frequently can test my change. Change-Id: Ib632d9538165f55fde848c3f288bc3687f6797a9 --- M puppet/modules/mediawiki/files/run-git-update 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/04/174804/1 diff --git a/puppet/modules/mediawiki/files/run-git-update b/puppet/modules/mediawiki/files/run-git-update index be3faed..4d487b8 100644 --- a/puppet/modules/mediawiki/files/run-git-update +++ b/puppet/modules/mediawiki/files/run-git-update @@ -20,9 +20,9 @@ if [[ $url == ssh://* ]]; then # Convert remote git url from ssh:// to anonymous https:// tempurl=$(echo $url | sed -e 's!ssh://[^@]\+@!https://!g' -e 's!:29418!/r!g') - git pull $tempurl + git pull --rebase $tempurl else - git pull + git pull --rebase fi if [[ $? -ne 0 ]]; then # If we didn't successfully update (possibly because we're on -- To view, visit https://gerrit.wikimedia.org/r/174804 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib632d9538165f55fde848c3f288bc3687f6797a9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Andrew Bogott <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
