diff options
author | varac <varacanero@zeromail.org> | 2016-06-16 13:22:17 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2016-06-16 13:22:17 +0200 |
commit | ca1c2bce4c865f3c361e2cd74c95ea7c6355fdac (patch) | |
tree | 611df2168e9a6ab1f90607394ec86d88f5f0c031 | |
parent | e238ba23dbc5a70763da8a2084331803fe77c4be (diff) | |
parent | 1e99824df80b3e8f38e8144fb897b95a53366802 (diff) |
Merge branch 'master' of ssh://greyhound.leap.se:4422/usr/local/bin/platform_test
-rwxr-xr-x | leap-platform-test | 4 |
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 } |