From 7b6c2cbe567ee2c613677c1c1c076be9ecbc5c3a Mon Sep 17 00:00:00 2001
From: Aidan Hobson Sayers <aidanhs@cantab.net>
Date: Sat, 14 Jan 2017 03:10:45 +0000
Subject: [PATCH] If submodule init fails, try from scratch

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 505795d33e5..4f9148ede34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,10 +71,10 @@ script:
       if [ "$ALLOW_PR" = "" ] && [ "$TRAVIS_BRANCH" != "auto" ]; then
           echo skipping, not a full build;
       elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-          travis_retry git submodule update --init &&
+          travis_retry sh -c 'git submodule deinit -f . && git submodule update --init' &&
           src/ci/run.sh;
       else
-          travis_retry git submodule update --init &&
+          travis_retry sh -c 'git submodule deinit -f . && git submodule update --init' &&
           src/ci/docker/run.sh $IMAGE;
       fi