From af16d8ba5c9680febadeeed51a9be4bb5e9bf1d5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 13 Nov 2017 15:24:37 +0100 Subject: [PATCH] Explicitly set "update = checkout" option for submodules It seems that older Git versions don't update submodules when issuing just "git submodule update" if this option is not set. We might actually prefer to use "update = rebase" but for now use the smallest change that will (hopefully) allow people using older Git versions to get the submodule updates. --- .gitmodules | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitmodules b/.gitmodules index 866d374c8b..ec57ac48de 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,23 +1,29 @@ [submodule "3rdparty/catch"] path = 3rdparty/catch url = https://github.com/wxWidgets/Catch.git + update = checkout [submodule "src/zlib"] path = src/zlib url = https://github.com/wxWidgets/zlib.git branch = wx + update = checkout [submodule "src/png"] path = src/png url = https://github.com/wxWidgets/libpng.git branch = wx + update = checkout [submodule "src/expat"] path = src/expat url = https://github.com/wxWidgets/libexpat.git branch = wx + update = checkout [submodule "src/tiff"] path = src/tiff url = https://github.com/wxWidgets/libtiff.git branch = wx + update = checkout [submodule "src/jpeg"] path = src/jpeg url = https://github.com/wxWidgets/libjpeg-turbo.git branch = wx + update = checkout