From 237654c42a0dc8d8812aff545e38c2a76a8e6355 Mon Sep 17 00:00:00 2001 From: Markham Date: Sat, 3 Oct 2020 17:54:24 +0200 Subject: [PATCH] fix git submodule update --- make/prerequisites.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- 2.39.5