jenkins-bot has submitted this change and it was merged.
Change subject: Make sure to reset to origin/master, and show current sha1
before doing so
......................................................................
Make sure to reset to origin/master, and show current sha1 before doing so
Change-Id: If772ae8630a2a39123f0b400f24a052068d735d6
---
M fabfile.py
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/fabfile.py b/fabfile.py
index 36a582e..5d8dd33 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -23,7 +23,8 @@
@task
def pull():
with cd(code_dir):
- sudo('git reset --hard')
+ sudo('git rev-list HEAD --max-count=1')
+ sudo('git reset --hard origin/master')
sudo('git pull')
--
To view, visit https://gerrit.wikimedia.org/r/181584
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If772ae8630a2a39123f0b400f24a052068d735d6
Gerrit-PatchSet: 3
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
