This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 61120837a8618bd1691cc6e60fcd579ea79e350b Author: Mike DePaulo <mikedep333@gmail.com> Date: Fri Jul 31 00:09:07 2015 -0400 Fix builds on build-main-mswin after it is moved to a new release branch. --- bin/build-nsis-package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh index 3d47aa4..64ae283 100755 --- a/bin/build-nsis-package.sh +++ b/bin/build-nsis-package.sh @@ -122,7 +122,7 @@ prepare_workspace() { if [ -d "${PROJECT_DIR}/.git" ]; then cd "${PROJECT_DIR}" && git reset --hard git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" - git pull origin "${CHECKOUT}" + git pull --force origin "${CHECKOUT}" git fetch origin upstream:upstream || true git fetch origin pristine-tar:pristine-tar || true # and again, get the ${CHECKOUT} refspec in pure state -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git