fix git submodule update

diff --git a/make/prerequisites.mk b/make/prerequisites.mk
index b51b374f27119b3fa7a59ac4d83daef232802442..11b5fff4400b727038a63b8231926e5863150ee9 100755 (executable)
--- 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