The branch, master has been updated via 364bbade16751d9574f0a5da4d09450f1ed39f6e (commit) from 53dc690bf2d0e8abd15e34cef3c4a181778d2306 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 364bbade16751d9574f0a5da4d09450f1ed39f6e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jul 4 18:11:32 2011 +0200 enforcing git-checkouts ----------------------------------------------------------------------- Summary of changes: bin/x2go-build-package | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/bin/x2go-build-package b/bin/x2go-build-package index 07090a8..fb50d5e 100755 --- a/bin/x2go-build-package +++ b/bin/x2go-build-package @@ -106,13 +106,13 @@ prepare_workspace() { if [ -d $PROJECT_DIR/.git ]; then cd $PROJECT_DIR && git reset --hard - git checkout $CHECKOUT || git checkout -b $CHECKOUT + git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT git pull origin $CHECKOUT else cd $(dirname $PROJECT_DIR) git clone git://code.x2go.org/$PROJECT.git cd $PROJECT - git checkout $CHECKOUT || git checkout -b $CHECKOUT; + git checkout --force $CHECKOUT || git --force checkout -b $CHECKOUT; fi cd $PROJECT_DIR hooks/post-receive -- buildscripts.git (buildscripts upstream project) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "buildscripts.git" (buildscripts upstream project).