Siebrand has submitted this change and it was merged.
Change subject: Tweak updating scripts
......................................................................
Tweak updating scripts
Change-Id: I2ef58d6d7ad2ad1be40ab60a53fae62ac5e897c2
---
M bin/twn-update-all
M bin/wikiupdate
2 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/bin/twn-update-all b/bin/twn-update-all
index 9a522da..951a92b 100755
--- a/bin/twn-update-all
+++ b/bin/twn-update-all
@@ -7,6 +7,7 @@
REV=`git log --pretty='%h %ci (%cr)' -n 1`
udpcast "updating $WIKINAME from $REV..."
+echo "*** Updating config ***"
cd /home/betawiki/config
sudo -u betawiki git pull
diff --git a/bin/wikiupdate b/bin/wikiupdate
index 74e7f1b..27b7baf 100755
--- a/bin/wikiupdate
+++ b/bin/wikiupdate
@@ -5,8 +5,7 @@
cd $WIKI
echo "*** Updating core ***"
-git fetch --all
-git pull origin master
+git pull --rebase origin master
cd extensions
@@ -17,7 +16,7 @@
cd $dir
if [ -d ".git" ]; then
echo -n "$dir.. ";
- git pull |grep -v Already &
+ git pull --rebase |grep -v Already &
let count+=1; [[ $((count%10)) -eq 0 ]] && wait
fi
cd ..
@@ -30,4 +29,3 @@
wait
echo "*** All done ***"
-echo "Consider running git commit -a to commit local changes"
--
To view, visit https://gerrit.wikimedia.org/r/52618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ef58d6d7ad2ad1be40ab60a53fae62ac5e897c2
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
