From 364bbade16751d9574f0a5da4d09450f1ed39f6e Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Mon, 4 Jul 2011 18:11:32 +0200
Subject: enforcing git-checkouts

---
 bin/x2go-build-package | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

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
 
-- 
cgit v1.2.3