Right, our git repo was broken a bit, and that's fixed now. It's best to

 git fetch
 git reset --hard origin/master

You should save local commits on master and then re-apply them, and be
careful not to push the broken scripty commits to master again!

-- 
Boudewijn Rempt | http://www.krita.org, http://www.valdyas.org