summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-07-04 15:40:15 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-07-04 15:40:15 +0200
commit53dc690bf2d0e8abd15e34cef3c4a181778d2306 (patch)
tree188babb22b32463c1d36162d73a40987fba8a62b
parentb08d45e3794cb76270ba289fe2e73d1d73dec772 (diff)
downloadbuildscripts-53dc690bf2d0e8abd15e34cef3c4a181778d2306.tar.gz
buildscripts-53dc690bf2d0e8abd15e34cef3c4a181778d2306.tar.bz2
buildscripts-53dc690bf2d0e8abd15e34cef3c4a181778d2306.zip
fix for last commit
-rwxr-xr-xbin/x2go-build-package2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/x2go-build-package b/bin/x2go-build-package
index 3cb6100..07090a8 100755
--- a/bin/x2go-build-package
+++ b/bin/x2go-build-package
@@ -106,8 +106,8 @@ prepare_workspace() {
if [ -d $PROJECT_DIR/.git ]; then
cd $PROJECT_DIR && git reset --hard
+ git checkout $CHECKOUT || git checkout -b $CHECKOUT
git pull origin $CHECKOUT
- git checkout origin $CHECKOUT || git checkout -b $CHECKOUT
else
cd $(dirname $PROJECT_DIR)
git clone git://code.x2go.org/$PROJECT.git