summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-07-04 18:15:55 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-07-04 18:15:55 +0200
commitd079d87d600c82022c2659341662a22c76095611 (patch)
treec25a7474243f134a394511225581e20e59a8b715
parent0374acf263de19a8e68c7dd4c31769fabaa46159 (diff)
downloadbuildscripts-d079d87d600c82022c2659341662a22c76095611.tar.gz
buildscripts-d079d87d600c82022c2659341662a22c76095611.tar.bz2
buildscripts-d079d87d600c82022c2659341662a22c76095611.zip
enforcing another reset --hard after pulling the refspec
-rwxr-xr-xbin/x2go-build-package2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/x2go-build-package b/bin/x2go-build-package
index 3492f50..88a1174 100755
--- a/bin/x2go-build-package
+++ b/bin/x2go-build-package
@@ -108,6 +108,8 @@ prepare_workspace() {
cd $PROJECT_DIR && git reset --hard
git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT
git pull origin $CHECKOUT
+ # and again, get the $CHECKOUT refspec in pure state
+ git reset --hard
else
cd $(dirname $PROJECT_DIR)
git clone git://code.x2go.org/$PROJECT.git