From: Markham <markham001@gmx.de>
Date: Sat, 3 Oct 2020 15:54:24 +0000 (+0200)
Subject: fix git submodule update
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=237654c42a0dc8d8812aff545e38c2a76a8e6355;p=bs-cst-neutrino-hd.git

fix git submodule update
---

diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index b51b374..11b5fff 100755
--- a/make/prerequisites.mk
+++ b/make/prerequisites.mk
@@ -133,7 +133,8 @@ $(GIT_PLUGINS):
 		if [ -d $(GIT_PLUGINS) ]; then \
 			cd $(GIT_PLUGINS) && \
 			git pull origin master; \
-			git submodule update; \
+			git submodule foreach --recursive git fetch; \
+			git submodule foreach git merge origin master; \
 		else \
 			git clone --recursive $(CSGIT)/$(REPO_PLUGINS) PLUGINS; \
 		fi