diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-07-04 18:11:32 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-07-04 18:11:32 +0200 |
| commit | 364bbade16751d9574f0a5da4d09450f1ed39f6e (patch) | |
| tree | 1055012f5eeb7ccae08e1942b93b65b3ccccf5f8 | |
| parent | 53dc690bf2d0e8abd15e34cef3c4a181778d2306 (diff) | |
| download | buildscripts-364bbade16751d9574f0a5da4d09450f1ed39f6e.tar.gz buildscripts-364bbade16751d9574f0a5da4d09450f1ed39f6e.tar.bz2 buildscripts-364bbade16751d9574f0a5da4d09450f1ed39f6e.zip | |
enforcing git-checkouts
| -rwxr-xr-x | bin/x2go-build-package | 4 |
1 files changed, 2 insertions, 2 deletions
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 |