From 6250b57bf8844fbf8386d482cbbccdde9151ff96 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 2 Nov 2021 18:36:19 +1100 Subject: [PATCH] git: changed to https git protocol --- .gitmodules | 14 +++++++------- Tools/gittools/submodule-sync.sh | 12 ++++++++++++ modules/mavlink | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) create mode 100755 Tools/gittools/submodule-sync.sh diff --git a/.gitmodules b/.gitmodules index 1d5553e873..6d24678ed7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,21 +1,21 @@ [submodule "modules/uavcan"] path = modules/uavcan - url = git://github.com/ArduPilot/uavcan.git + url = https://github.com/ArduPilot/uavcan.git [submodule "modules/waf"] path = modules/waf - url = git://github.com/ArduPilot/waf.git + url = https://github.com/ArduPilot/waf.git [submodule "modules/gbenchmark"] path = modules/gbenchmark - url = git://github.com/google/benchmark.git + url = https://github.com/google/benchmark.git [submodule "modules/mavlink"] path = modules/mavlink - url = git://github.com/ArduPilot/mavlink + url = https://github.com/ArduPilot/mavlink [submodule "gtest"] path = modules/gtest - url = git://github.com/ArduPilot/googletest + url = https://github.com/ArduPilot/googletest [submodule "modules/ChibiOS"] path = modules/ChibiOS - url = git://github.com/ArduPilot/ChibiOS.git + url = https://github.com/ArduPilot/ChibiOS.git [submodule "modules/libcanard"] path = modules/libcanard - url = git://github.com/ArduPilot/libcanard.git + url = https://github.com/ArduPilot/libcanard.git diff --git a/Tools/gittools/submodule-sync.sh b/Tools/gittools/submodule-sync.sh new file mode 100755 index 0000000000..9f90c5e886 --- /dev/null +++ b/Tools/gittools/submodule-sync.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +# this copes with moving origin remote to a new git organisation +# we run it 3 times due to the poor handling of recursion +git submodule update --recursive --force --init +git submodule sync --recursive + +git submodule update --recursive --force --init +git submodule sync --recursive + +git submodule update --recursive --force --init +git submodule sync --recursive diff --git a/modules/mavlink b/modules/mavlink index 5034afb62a..a09b54f513 160000 --- a/modules/mavlink +++ b/modules/mavlink @@ -1 +1 @@ -Subproject commit 5034afb62a2f8aef2b11717cbb0428a4115f4c60 +Subproject commit a09b54f513facafc53c67fc1f8af88ec09c174ae