From 2fb4e1117491405adcf44d05c0ddecd1a6599f06 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sat, 3 Feb 2018 18:28:20 +0100
Subject: [PATCH] Remove "update = checkout" option for submodules

This reverts af16d8ba5c9680febadeeed51a9be4bb5e9bf1d5. It caused
problems with older git versions (e.g. 1.8.5) that do not recognize the
checkout option: warning: unknown update mode 'checkout' suggested for
submodule '3rdparty/catch' Skipping submodule '3rdparty/catch'

Also specify the branch for the catch submodule, to be in line with the
other submodules.
---
 .gitmodules | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index ec57ac48deb2..8373eef87134 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,29 +1,24 @@
 [submodule "3rdparty/catch"]
 	path = 3rdparty/catch
 	url = https://github.com/wxWidgets/Catch.git
-	update = checkout
+	branch = wx
 [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