summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-06-16 11:22:01 +0000
committervarac <varacanero@zeromail.org>2016-06-16 11:22:01 +0000
commit1e99824df80b3e8f38e8144fb897b95a53366802 (patch)
tree8c035e990bd660e603195c2119b3b97c3af1672d
parent6d6e701651341ee58832527b54793c4cb9282d88 (diff)
more robust checkout to switch from submodules to subrepos
-rwxr-xr-xleap-platform-test4
1 files changed, 2 insertions, 2 deletions
diff --git a/leap-platform-test b/leap-platform-test
index 3f14786..2dd7f9e 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -501,8 +501,8 @@ update_platform () {
git fetch
git checkout master
git branch -D $PLATFORM_BRANCH
- git checkout -b $PLATFORM_BRANCH origin/$PLATFORM_BRANCH
-
+ git checkout -f -b $PLATFORM_BRANCH origin/$PLATFORM_BRANCH
+ git clean -fd
git submodule sync
git submodule update --init
}