Skip to content

Commit

Permalink
Remove "update = checkout" option for submodules
Browse files Browse the repository at this point in the history
This reverts af16d8b. 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.
  • Loading branch information
MaartenBent authored and vadz committed Feb 3, 2018
1 parent 683185a commit 2fb4e11
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 2fb4e11

Please sign in to comment.