update_platform() is now able to updated even if branch was forcefully pushed, i.e. rebased

1 files changed, 14 insertions, 1 deletions

diff --git a/leap-platform-test b/leap-platform-test
index a48eff4..bdeddc7 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -427,7 +427,20 @@ update_leap_cli () {
 
 update_platform () {
     cd "$PLATFORMDIR"
-    git pull
+    # works also with forces updates, i.e. reabased branches like citest
+    # http://stackoverflow.com/questions/4550937/how-to-force-update-when-doing-git-pull/14359894#14359894
+
+    # throw away local uncommitted changes
+    git reset --hard HEAD
+    # remove untracked files
+    git clean -f    
+
+    git fetch
+    git checkout origin/$PLATFORM_BRANCH
+    git checkout -B $PLATFORM_BRANCH
+
+    git submodule sync
+    git submodule update --init
 }
 
 versions () {